diff options
| author | Karen Langford <karen.langford@oracle.com> | 2012-01-11 18:51:42 +0100 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2012-01-11 18:51:42 +0100 |
| commit | 1af8783b074583b3f21ac9c29809f964c29177c7 (patch) | |
| tree | 6e6e6c8ee901626080c876320e6f68c81e8483f6 /mysql-test/r | |
| parent | 7faf69dd82550d921761c142aefeb93c93c4f44b (diff) | |
| parent | b2766703a85ec1c806074b0aee8a8ad85d6b4d77 (diff) | |
| download | mariadb-git-1af8783b074583b3f21ac9c29809f964c29177c7.tar.gz | |
Merge from mysql-5.1.61-release
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/key_cache.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index f80fea0fc76..78dd65fdcb1 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -365,3 +365,19 @@ Variable_name Value key_cache_block_size 1536 SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size; DROP TABLE t1; +# +# Bug#12361113: crash when load index into cache +# +# Note that this creates an empty disabled key cache! +SET GLOBAL key_cache_none.key_cache_block_size = 1024; +CREATE TABLE t1 (a INT, b INTEGER NOT NULL, KEY (b) ) ENGINE = MYISAM; +INSERT INTO t1 VALUES (1, 1); +CACHE INDEX t1 in key_cache_none; +ERROR HY000: Unknown key cache 'key_cache_none' +# The bug crashed the server at LOAD INDEX below. Now it will succeed +# since the default cache is used due to CACHE INDEX failed for +# key_cache_none. +LOAD INDEX INTO CACHE t1; +Table Op Msg_type Msg_text +test.t1 preload_keys status OK +DROP TABLE t1; diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 5f1a0565b10..ffba0d443e7 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -147,6 +147,7 @@ DROP TABLE `@`; CREATE TABLE `я` (a INT); SET NAMES DEFAULT; mysqlcheck --default-character-set="latin1" --databases test +call mtr.add_suppression("Can't find file: '..test.@003f.frm'"); test.? Error : Table doesn't exist status : Operation failed |