diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
| commit | 10740939eb824bbd792352f654380e258edd7675 (patch) | |
| tree | a4c68f331f0470b8bd30822de5938a6552f69738 /mysql-test/suite/heap | |
| parent | a91c59c2affdebb4b34c2c8000b0b1648d43046d (diff) | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| download | mariadb-git-10740939eb824bbd792352f654380e258edd7675.tar.gz | |
5.5 merge
Diffstat (limited to 'mysql-test/suite/heap')
| -rw-r--r-- | mysql-test/suite/heap/heap.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/heap/heap.test | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index 1e7656a3a44..d2c9977e4bd 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -758,6 +758,14 @@ SELECT * from t1; id color ts 7 GREEN 2 DROP TABLE t1; +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); +SET @@max_heap_table_size = 1024*1024*1024*20; +CREATE TEMPORARY TABLE tmp ENGINE=MEMORY +SELECT id FROM t1; +DROP TEMPORARY TABLE tmp; +drop table t1; # # BUG#11825482: Broken key length calculation for btree index # diff --git a/mysql-test/suite/heap/heap.test b/mysql-test/suite/heap/heap.test index b504661d0ff..b5defdb37af 100644 --- a/mysql-test/suite/heap/heap.test +++ b/mysql-test/suite/heap/heap.test @@ -510,6 +510,22 @@ DELETE FROM t1 WHERE ts = 1 AND color = 'GREEN'; SELECT * from t1; DROP TABLE t1; + +# +# MDEV-5905 Creating tmp. memory table kills the server +# + +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1); +INSERT INTO t1 VALUES (2); + +SET @@max_heap_table_size = 1024*1024*1024*20; + +CREATE TEMPORARY TABLE tmp ENGINE=MEMORY + SELECT id FROM t1; +DROP TEMPORARY TABLE tmp; +drop table t1; + --echo # --echo # BUG#11825482: Broken key length calculation for btree index --echo # |