diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-14 16:06:41 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-14 16:06:41 +0100 |
| commit | 47a54a2e087a7c1fc861bcbc114c14987f492cfe (patch) | |
| tree | 6fd2aa26626f3f8e7ae49333ca3fbb546a992972 /sql/sql_admin.cc | |
| parent | bbd20403c5f759fa3ce866703a5fba0d193a1734 (diff) | |
| parent | 16036b5e61d8f48f352ac4e1f68a541f45f2ae34 (diff) | |
| download | mariadb-git-47a54a2e087a7c1fc861bcbc114c14987f492cfe.tar.gz | |
Merge MySQL 5.5.20 into MariaDB 5.5.
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index f01e279333d..5897d74582a 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -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, |