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 /mysql-test/r | |
| 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 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/archive.result | 19 | ||||
| -rw-r--r-- | mysql-test/r/key_cache.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 347635abb82..0ec84efa842 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -12782,3 +12782,22 @@ a b c d e f -1 b c d e 1 DROP TABLE t1; SET sort_buffer_size=DEFAULT; +# +# BUG#11758979 - 51252: ARCHIVE TABLES CAUSE 100% CPU USAGE +# AND HANG IN SHOW TABLE STATUS +# (to be executed with valgrind) +CREATE TABLE t1(a BLOB, b VARCHAR(200)) ENGINE=ARCHIVE; +INSERT INTO t1 VALUES(NULL, ''); +FLUSH TABLE t1; +# we need this select to workaround BUG#11764364 +SELECT * FROM t1; +a b +NULL +CHECKSUM TABLE t1 EXTENDED; +Table Checksum +test.t1 286155052 +FLUSH TABLE t1; +OPTIMIZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 optimize status OK +DROP TABLE t1; diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result index fe579431420..9888eadcb31 100644 --- a/mysql-test/r/key_cache.result +++ b/mysql-test/r/key_cache.result @@ -367,6 +367,22 @@ 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; set global key_buffer_size=@save_key_buffer_size; set global key_cache_block_size=@save_key_cache_block_size; select @@key_buffer_size; diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index 8aa121f9854..c3139f4d5ca 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -140,6 +140,7 @@ CREATE TABLE `я` (a INT); SET NAMES DEFAULT; call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); 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 |