diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:49:21 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 17:49:21 +0200 |
| commit | 038b739c98009cf0b4b7b7c2c18421051abf79f2 (patch) | |
| tree | c31b05bf35b15358f7b0a89cfd8b5b43e2901ad8 /sql/sql_table.cc | |
| parent | 3c07d04580fe5f28ff8bdabd1249b8123d7da76b (diff) | |
| parent | ae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (diff) | |
| download | mariadb-git-038b739c98009cf0b4b7b7c2c18421051abf79f2.tar.gz | |
Merge with MariaDB 5.1 and MySQL 5.1.61
Diffstat (limited to 'sql/sql_table.cc')
| -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 504059eb040..2563f923730 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5250,6 +5250,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, |