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_db.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_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 72ae664bba1..5a266c3fac9 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -181,7 +181,7 @@ uchar* dboptions_get_key(my_dbopt_t *opt, size_t *length, static inline void write_to_binlog(THD *thd, char *query, uint q_len, char *db, uint db_len) { - Query_log_event qinfo(thd, query, q_len, 0, 0); + Query_log_event qinfo(thd, query, q_len, 0, 0, THD::NOT_KILLED); qinfo.error_code= 0; qinfo.db= db; qinfo.db_len= db_len; @@ -724,7 +724,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, query, query_length, 0, - /* suppress_use */ TRUE); + /* suppress_use */ TRUE, THD::NOT_KILLED); /* Write should use the database being created as the "current @@ -812,7 +812,7 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info) if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, thd->query, thd->query_length, 0, - /* suppress_use */ TRUE); + /* suppress_use */ TRUE, THD::NOT_KILLED); /* Write should use the database being created as the "current @@ -959,7 +959,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, query, query_length, 0, - /* suppress_use */ TRUE); + /* suppress_use */ TRUE, THD::NOT_KILLED); /* Write should use the database being created as the "current database" and not the threads current database, which is the @@ -1958,7 +1958,8 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db) /* Step8: logging */ if (mysql_bin_log.is_open()) { - Query_log_event qinfo(thd, thd->query, thd->query_length, 0, TRUE); + Query_log_event qinfo(thd, thd->query, thd->query_length, + 0, TRUE, THD::NOT_KILLED); thd->clear_error(); mysql_bin_log.write(&qinfo); } |