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

Fixed new introduced bug in binlog.test with --ps-protocol

Browse Source
This commit is contained in:
monty@mysql.com
2006-02-25 13:24:18 +02:00
parent 82b77cdd90
commit dd1d40f8f8
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/t/binlog.test
View File

@ -19,7 +19,7 @@ begin;
insert t2 values (5); insert t2 values (5);
commit; commit;
# first COMMIT must be Query_log_event, second - Xid_log_event # first COMMIT must be Query_log_event, second - Xid_log_event
--replace_result "xid=19" "xid=12" --replace_result "xid=21" "xid=12"
--replace_column 2 # 5 # --replace_column 2 # 5 #
show binlog events from 98; show binlog events from 98;
drop table t1,t2; drop table t1,t2;
@ -41,7 +41,7 @@ while ($1)
--enable_query_log --enable_query_log
commit; commit;
drop table t1; drop table t1;
--replace_result "xid=30" "xid=19" --replace_result "xid=32" "xid=19"
--replace_column 2 # 5 # --replace_column 2 # 5 #
show binlog events in 'master-bin.000001' from 98; show binlog events in 'master-bin.000001' from 98;
--replace_column 2 # 5 # --replace_column 2 # 5 #

7
sql/sql_db.cc
View File

@ -1109,6 +1109,9 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
DBUG_ENTER("mysql_change_db"); DBUG_ENTER("mysql_change_db");
DBUG_PRINT("enter",("name: '%s'",name)); DBUG_PRINT("enter",("name: '%s'",name));
LINT_INIT(db_length);
LINT_INIT(db_access);
/* dbname can only be NULL if malloc failed */ /* dbname can only be NULL if malloc failed */
if (!dbname || !(db_length= strlen(dbname))) if (!dbname || !(db_length= strlen(dbname)))
{ {
@ -1126,7 +1129,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if (check_db_name(dbname)) if (check_db_name(dbname))
{ {
my_error(ER_WRONG_DB_NAME, MYF(0), dbname); my_error(ER_WRONG_DB_NAME, MYF(0), dbname);
x_free(dbname); my_free(dbname, MYF(0));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
DBUG_PRINT("info",("Use database: %s", dbname)); DBUG_PRINT("info",("Use database: %s", dbname));
@ -1176,8 +1179,6 @@ end:
x_free(thd->db); x_free(thd->db);
if (dbname && dbname[0] == 0) if (dbname && dbname[0] == 0)
{ {
if (!(thd->slave_thread))
x_free(dbname);
thd->db= NULL; thd->db= NULL;
thd->db_length= 0; thd->db_length= 0;
} }

4
tests/mysql_client_test.c
View File

@ -14724,9 +14724,9 @@ static void test_bug12744()
mysql_close(mysql); mysql_close(mysql);
if (rc= mysql_stmt_execute(prep_stmt)) if ((rc= mysql_stmt_execute(prep_stmt)))
{ {
if (rc= mysql_stmt_reset(prep_stmt)) if ((rc= mysql_stmt_reset(prep_stmt)))
printf("OK!\n"); printf("OK!\n");
else else
{ {