summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2008-03-23 14:29:35 +0200
committerunknown <gkodinov/kgeorge@macbook.gmz>2008-03-23 14:29:35 +0200
commit7bcbc7f2d5078d308c25f7d1c92995c64af7b8bc (patch)
tree42bf964a58bf1e828b9069d52e035f8fc72699d3 /sql
parent1b6118190ef30d4211609e284d164873f11c8688 (diff)
downloadmariadb-git-7bcbc7f2d5078d308c25f7d1c92995c64af7b8bc.tar.gz
merge bug 26461 to 5.1-opt
Diffstat (limited to 'sql')
-rw-r--r--sql/handler.h2
-rw-r--r--sql/log.cc2
-rw-r--r--sql/sql_table.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 9800f4974c3..a3743c78f34 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1883,7 +1883,7 @@ private:
{ 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)
diff --git a/sql/log.cc b/sql/log.cc
index c2e0c85acfe..67438da6008 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -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,
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c62d0545fda..2baf26f5953 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -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,