Commit 8c75a406 authored by unknown's avatar unknown

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1

parents cf45aa2b 4eb6fd53
...@@ -809,4 +809,12 @@ show status like "Qcache_queries_in_cache"; ...@@ -809,4 +809,12 @@ show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 4 Qcache_queries_in_cache 4
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (a int(1));
CREATE DATABASE mysqltest;
USE mysqltest;
DROP DATABASE mysqltest;
SELECT * FROM test.t1;
a
USE test;
DROP TABLE t1;
SET GLOBAL query_cache_size=0; SET GLOBAL query_cache_size=0;
...@@ -585,4 +585,17 @@ show status like "Qcache_queries_in_cache"; ...@@ -585,4 +585,17 @@ show status like "Qcache_queries_in_cache";
# Keep things tidy # Keep things tidy
# #
DROP TABLE t1; DROP TABLE t1;
#
# DROP current database test
#
CREATE TABLE t1 (a int(1));
CREATE DATABASE mysqltest;
USE mysqltest;
DROP DATABASE mysqltest;
SELECT * FROM test.t1;
USE test;
DROP TABLE t1;
SET GLOBAL query_cache_size=0; SET GLOBAL query_cache_size=0;
...@@ -409,7 +409,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) ...@@ -409,7 +409,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
when the slave is replicating a DROP DATABASE: when the slave is replicating a DROP DATABASE:
- garbage characters in the error message: - garbage characters in the error message:
"Error 'Can't drop database 'test2'; database doesn't exist' on query "Error 'Can't drop database 'test2'; database doesn't exist' on query
'h4zI'" 'h4zI'"
- segfault - segfault
- hang in "free(vio)" (yes!) in the I/O or SQL slave threads (so slave - hang in "free(vio)" (yes!) in the I/O or SQL slave threads (so slave
server hangs at shutdown etc). server hangs at shutdown etc).
...@@ -418,7 +418,8 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) ...@@ -418,7 +418,8 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
{ {
if (!(thd->slave_thread)) /* a slave thread will free it itself */ if (!(thd->slave_thread)) /* a slave thread will free it itself */
x_free(thd->db); x_free(thd->db);
thd->db= 0; thd->db= 0;
thd->db_length= 0;
} }
exit2: exit2:
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db)); VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment