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

merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-03 23:39:53 +01:00
parent 0e007344ea 11400de10c
commit 6edd76785c
68 changed files with 286 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_db.cc
View File

@ -1660,7 +1660,7 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db)
/* Lock the old name, the new name will be locked by mysql_create_db().*/
if (lock_schema_name(thd, old_db->str))
DBUG_RETURN(-1);
DBUG_RETURN(1);
/*
Let's remember if we should do "USE newdb" afterwards.