diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
| commit | 6edd76785c2fff55f1869ef816da13a8bab6151d (patch) | |
| tree | c987eb9a81d19b6544fc6688632bedd80f7622d1 /sql/sql_db.cc | |
| parent | 0e007344eae972b9be7d88ca43373cb33662ac1c (diff) | |
| parent | 11400de10cdfa9047904539fb9e7fbff611d9391 (diff) | |
| download | mariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz | |
merge
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 1cd615394fb..8013d2bd6e2 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -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. |