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

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

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.1-kt
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2006-06-22 18:38:26 +05:00
parent 5eea972046 bcb2ceec71
commit ac487f52aa
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/renamedb.result
View File

@ -27,3 +27,7 @@ a
2
3
drop database testdb2;
create database testdb1;
rename database testdb1 to testdb1;
ERROR HY000: Can't create database 'testdb1'; database exists
drop database testdb1;

8
mysql-test/t/renamedb.test
View File

@ -16,3 +16,11 @@ select database();
show tables;
select a from t1 order by a;
drop database testdb2;
#
# Bug#19392 Rename Database: Crash if case change
#
create database testdb1;
--error 1007
rename database testdb1 to testdb1;
drop database testdb1;

6
sql/sql_db.cc
View File

@ -134,9 +134,9 @@ void lock_db_delete(const char *name, uint length)
{
my_dblock_t *opt;
safe_mutex_assert_owner(&LOCK_lock_db);
opt= (my_dblock_t *)hash_search(&lock_db_cache, (const byte*) name, length);
DBUG_ASSERT(opt != NULL);
hash_delete(&lock_db_cache, (byte*) opt);
if ((opt= (my_dblock_t *)hash_search(&lock_db_cache,
(const byte*) name, length)))
hash_delete(&lock_db_cache, (byte*) opt);
}