1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge Bug#45520 fix from 5.0-bugteam

Browse Source
This commit is contained in:
He Zhenxing 2009-12-09 14:24:54 +08:00
commit b13541ff31
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_killed_ddl.result
View File

@ -63,7 +63,7 @@ source include/diff_master_slave.inc;
DROP DATABASE d1; DROP DATABASE d1;
source include/kill_query.inc; source include/kill_query.inc;
source include/diff_master_slave.inc; source include/diff_master_slave.inc;
DROP DATABASE d2; DROP DATABASE IF EXISTS d2;
source include/kill_query.inc; source include/kill_query.inc;
source include/diff_master_slave.inc; source include/diff_master_slave.inc;
CREATE EVENT e2 CREATE EVENT e2

4
mysql-test/suite/rpl/t/rpl_killed_ddl.test
View File

@ -153,7 +153,7 @@ source include/kill_query_and_diff_master_slave.inc;
send DROP DATABASE d1; send DROP DATABASE d1;
source include/kill_query_and_diff_master_slave.inc; source include/kill_query_and_diff_master_slave.inc;
send DROP DATABASE d2; send DROP DATABASE IF EXISTS d2;
source include/kill_query_and_diff_master_slave.inc; source include/kill_query_and_diff_master_slave.inc;
######## EVENT ######## ######## EVENT ########
@ -226,7 +226,7 @@ source include/kill_query_and_diff_master_slave.inc;
send DROP PROCEDURE p1; send DROP PROCEDURE p1;
source include/kill_query_and_diff_master_slave.inc; source include/kill_query_and_diff_master_slave.inc;
# Temporarily disabled, see comment above for DROP FUNCTION IF EXISTS # Temporarily disabled because of bug#43353, see comment above for DROP FUNCTION IF EXISTS
#send DROP PROCEDURE IF EXISTS p2; #send DROP PROCEDURE IF EXISTS p2;
#source include/kill_query_and_diff_master_slave.inc; #source include/kill_query_and_diff_master_slave.inc;

11
sql/sql_db.cc
View File

@ -695,6 +695,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
file. In this case it's best to just continue as if nothing has file. In this case it's best to just continue as if nothing has
happened. (This is a very unlikely senario) happened. (This is a very unlikely senario)
*/ */
thd->clear_error();
} }
not_silent: not_silent:
@ -810,9 +811,9 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
int errcode= query_error_code(thd, TRUE); thd->clear_error();
Query_log_event qinfo(thd, thd->query(), thd->query_length(), 0, Query_log_event qinfo(thd, thd->query(), thd->query_length(), 0,
/* suppress_use */ TRUE, errcode); /* suppress_use */ TRUE, 0);
/* /*
Write should use the database being created as the "current Write should use the database being created as the "current
@ -822,7 +823,6 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
qinfo.db = db; qinfo.db = db;
qinfo.db_len = strlen(db); qinfo.db_len = strlen(db);
thd->clear_error();
/* These DDL methods and logging protected with LOCK_mysql_create_db */ /* These DDL methods and logging protected with LOCK_mysql_create_db */
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
} }
@ -962,9 +962,9 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
} }
if (mysql_bin_log.is_open()) if (mysql_bin_log.is_open())
{ {
int errcode= query_error_code(thd, TRUE); thd->clear_error();
Query_log_event qinfo(thd, query, query_length, 0, Query_log_event qinfo(thd, query, query_length, 0,
/* suppress_use */ TRUE, errcode); /* suppress_use */ TRUE, 0);
/* /*
Write should use the database being created as the "current Write should use the database being created as the "current
database" and not the threads current database, which is the database" and not the threads current database, which is the
@ -973,7 +973,6 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
qinfo.db = db; qinfo.db = db;
qinfo.db_len = strlen(db); qinfo.db_len = strlen(db);
thd->clear_error();
/* These DDL methods and logging protected with LOCK_mysql_create_db */ /* These DDL methods and logging protected with LOCK_mysql_create_db */
mysql_bin_log.write(&qinfo); mysql_bin_log.write(&qinfo);
} }