diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-14 14:05:22 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-12-14 14:05:22 +0100 |
| commit | 3ea35d31f02bb2d7ce7df0facd77d112be40a619 (patch) | |
| tree | 25836ca2da6a0395cabb2f5786cfc45e58cf6618 /sql | |
| parent | a6145f4b62bd264ad32d2dade98eda0cc6de0dba (diff) | |
| parent | beedf6b261b243ec0a2332162bface6ec7d58dd0 (diff) | |
| download | mariadb-git-3ea35d31f02bb2d7ce7df0facd77d112be40a619.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 4320cef2c49..2bb758f8b86 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2680,6 +2680,11 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* tables, DBUG_RETURN(TRUE); } pthread_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, |