diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-04-09 07:42:51 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-04-09 07:42:51 +0800 |
| commit | 85cff45ef791c411abd0782fcae77e2da7f532ec (patch) | |
| tree | 22e49a89755096df5a854d1016d5e19cc163820a /sql/sql_table.cc | |
| parent | 440858b8167162e29d5f1619448768c93e870926 (diff) | |
| parent | 51a91166387760546d563ebf72bfa037fcff24a8 (diff) | |
| download | mariadb-git-85cff45ef791c411abd0782fcae77e2da7f532ec.tar.gz | |
Manually merge BUG#37145 to 5.1-bugteam
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 842ece1dec4..64fc72ae96f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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); |