Commit ac487f52 authored by bar@bar.intranet.mysql.r18.ru's avatar bar@bar.intranet.mysql.r18.ru

Merge mysql.com:/usr/home/bar/mysql-5.1-new.19392

into  mysql.com:/usr/home/bar/mysql-5.1-kt
parents 5eea9720 bcb2ceec
...@@ -27,3 +27,7 @@ a ...@@ -27,3 +27,7 @@ a
2 2
3 3
drop database testdb2; drop database testdb2;
create database testdb1;
rename database testdb1 to testdb1;
ERROR HY000: Can't create database 'testdb1'; database exists
drop database testdb1;
...@@ -16,3 +16,11 @@ select database(); ...@@ -16,3 +16,11 @@ select database();
show tables; show tables;
select a from t1 order by a; select a from t1 order by a;
drop database testdb2; drop database testdb2;
#
# Bug#19392 Rename Database: Crash if case change
#
create database testdb1;
--error 1007
rename database testdb1 to testdb1;
drop database testdb1;
...@@ -134,8 +134,8 @@ void lock_db_delete(const char *name, uint length) ...@@ -134,8 +134,8 @@ void lock_db_delete(const char *name, uint length)
{ {
my_dblock_t *opt; my_dblock_t *opt;
safe_mutex_assert_owner(&LOCK_lock_db); safe_mutex_assert_owner(&LOCK_lock_db);
opt= (my_dblock_t *)hash_search(&lock_db_cache, (const byte*) name, length); if ((opt= (my_dblock_t *)hash_search(&lock_db_cache,
DBUG_ASSERT(opt != NULL); (const byte*) name, length)))
hash_delete(&lock_db_cache, (byte*) opt); hash_delete(&lock_db_cache, (byte*) opt);
} }
......
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