database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manually merge BUG#37145 to 5.1-bugteam

Browse Source
This commit is contained in:
He Zhenxing
2009-04-09 07:42:51 +08:00
parent 440858b816 51a9116638
commit 85cff45ef7
15 changed files with 682 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -1463,7 +1463,7 @@ void write_bin_log(THD *thd, bool clear_error,
if (clear_error)
thd->clear_error();
thd->binlog_query(THD::STMT_QUERY_TYPE,
query, query_length, FALSE, FALSE);
query, query_length, FALSE, FALSE, THD::NOT_KILLED);
}
}
@ -6165,7 +6165,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
if (mysql_bin_log.is_open())
{
thd->clear_error();
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
Query_log_event qinfo(thd, thd->query, thd->query_length,
0, FALSE, THD::NOT_KILLED);
mysql_bin_log.write(&qinfo);
}
my_ok(thd);