Commit ba2ba454 authored by gkodinov/kgeorge@macbook.gmz's avatar gkodinov/kgeorge@macbook.gmz
Browse files

merge bug 26461 to 5.1-opt

parent f6871c0d

sql/handler.h

+1 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,7 @@ class handler :public Sql_alloc 
  { return HA_ADMIN_NOT_IMPLEMENTED; }

  virtual int analyze(THD* thd, HA_CHECK_OPT* check_opt)

  { return HA_ADMIN_NOT_IMPLEMENTED; }

  virtual bool check_and_repair(THD *thd) { return HA_ERR_WRONG_COMMAND; }

  virtual bool check_and_repair(THD *thd) { return TRUE; }

  virtual int disable_indexes(uint mode) { return HA_ERR_WRONG_COMMAND; }

  virtual int enable_indexes(uint mode) { return HA_ERR_WRONG_COMMAND; }

  virtual int discard_or_import_tablespace(my_bool discard)

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ bool LOGGER::general_log_write(THD *thd, enum enum_server_command command, 


  current_time= my_time(0);

  while (*current_handler)

    error+= (*current_handler++)->

    error|= (*current_handler++)->

      log_general(thd, current_time, user_host_buff,

                  user_host_len, id,

                  command_name[(uint) command].str,

sql/sql_table.cc

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int copy_data_between_tables(TABLE *from,TABLE *to, 


static bool prepare_blob_field(THD *thd, Create_field *sql_field);

static bool check_engine(THD *, const char *, HA_CREATE_INFO *);

static bool

static int

mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,

                           Alter_info *alter_info,

                           bool tmp_table,
@@ -2173,7 +2173,7 @@ int prepare_create_field(Create_field *sql_field, 
    TRUE     error

*/



static bool

static int

mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,

                           Alter_info *alter_info,

                           bool tmp_table,