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 5.5.20 into MariaDB 5.5.

Browse Source
This commit is contained in:
unknown
2012-02-14 16:06:41 +01:00
parent bbd20403c5 16036b5e61
commit 47a54a2e08
9 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_admin.cc
View File

@ -935,6 +935,11 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* tables,
DBUG_RETURN(TRUE);
}
mysql_mutex_unlock(&LOCK_global_system_variables);
if (!key_cache->key_cache_inited)
{
my_error(ER_UNKNOWN_KEY_CACHE, MYF(0), key_cache_name->str);
DBUG_RETURN(true);
}
check_opt.key_cache= key_cache;
DBUG_RETURN(mysql_admin_table(thd, tables, &check_opt,
"assign_to_keycache", TL_READ_NO_INSERT, 0, 0,