Commit 662ca8fd authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 

into  c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/wl2826
parents 4624982e c1b8cff0

configure.in

+15 −12
Original line number Diff line number Diff line
@@ -1588,18 +1588,6 @@ then 
  DEBUG_OPTIMIZE_CXX=""

fi



# If we should allow error injection tests

AC_ARG_WITH(error-inject,

    [ --with-error-inject    Enable error injection in MySQL Server],

    [ with_error_inject=$withval ],

    [ with_error_inject=no ])



if test "$with_error_inject" = "yes"

then

  CFLAGS="-DERROR_INJECT_SUPPORT $CFLAGS"

  CXXFLAGS="-DERROR_INJECT_SUPPORT $CXXFLAGS"

fi



AC_ARG_WITH(debug,

    [  --with-debug            Add debug code

  --with-debug=full       Add debug code (adds memory checker, very slow)],
@@ -1621,6 +1609,21 @@ else 
  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"

fi



# If we should allow error injection tests

AC_ARG_WITH(error-inject,

    [ --with-error-inject    Enable error injection in MySQL Server],

    [ with_error_inject=$withval ],

    [ with_error_inject=no ])



if test $with_debug != "no"

then

  if test "$with_error_inject" = "yes"

  then

    AC_DEFINE([ERROR_INJECT_SUPPORT], [1],

              [Enable error injection in MySQL Server])

  fi

fi



AC_ARG_WITH([fast-mutexes],

	    AC_HELP_STRING([--with-fast-mutexes], 

	    [Compile with fast mutexes (default is disabled)]),

sql/handler.h

+7 −5
Original line number Diff line number Diff line
@@ -1378,11 +1378,13 @@ class handler :public Sql_alloc 
  virtual void drop_table(const char *name);

  

  virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info)=0;



#define CHF_DELETE_FLAG 1

#define CHF_RENAME_FLAG 2



  virtual int create_handler_files(const char *name, const char *old_name,

                                   bool rename_flag)

  {

    return FALSE;

  }

                                   int action_flag)

  { return FALSE; }



  virtual int change_partitions(HA_CREATE_INFO *create_info,

                                const char *path,
@@ -1390,7 +1392,7 @@ class handler :public Sql_alloc 
                                ulonglong *deleted,

                                const void *pack_frm_data,

                                uint pack_frm_len)

  { print_error(HA_ERR_WRONG_COMMAND, MYF(0)); return TRUE; }

  { return HA_ERR_WRONG_COMMAND; }

  virtual int drop_partitions(const char *path)

  { return HA_ERR_WRONG_COMMAND; }

  virtual int rename_partitions(const char *path)