summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/main/derived.result17
-rw-r--r--mysql-test/main/derived.test13
2 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/main/derived.result b/mysql-test/main/derived.result
index 112a72a2bf6..85ae1ebdf89 100644
--- a/mysql-test/main/derived.result
+++ b/mysql-test/main/derived.result
@@ -1476,5 +1476,22 @@ a
2
drop table t1;
#
+# MDEV-SIGSEGV in maria_create from create_internal_tmp_table
+# keydef incorrectly allocated on the stack in create_internal_tmp_table()
+#
+CREATE TABLE t (c CHAR(1) NULL) ENGINE=MyISAM;
+INSERT INTO t (c) VALUES (1);
+SET optimizer_where_cost=1,big_tables=1,in_predicate_conversion_threshold=2;
+Warnings:
+Warning 1287 '@@big_tables' is deprecated and will be removed in a future release
+SELECT * FROM t WHERE c IN ('','');
+c
+SET sql_mode='', optimizer_where_cost=1,big_tables=1,in_predicate_conversion_threshold=2;
+Warnings:
+Warning 1287 '@@big_tables' is deprecated and will be removed in a future release
+SELECT * FROM t WHERE c IN ('','');
+c
+DROP TABLE t;
+#
# End of 11.0 tests
#
diff --git a/mysql-test/main/derived.test b/mysql-test/main/derived.test
index e5f01e15821..3e6b3f2b194 100644
--- a/mysql-test/main/derived.test
+++ b/mysql-test/main/derived.test
@@ -1244,5 +1244,18 @@ SELECT a FROM t1 WHERE a IN ( 1, 1, 2, 194 );
drop table t1;
--echo #
+--echo # MDEV-SIGSEGV in maria_create from create_internal_tmp_table
+--echo # keydef incorrectly allocated on the stack in create_internal_tmp_table()
+--echo #
+
+CREATE TABLE t (c CHAR(1) NULL) ENGINE=MyISAM;
+INSERT INTO t (c) VALUES (1);
+SET optimizer_where_cost=1,big_tables=1,in_predicate_conversion_threshold=2;
+SELECT * FROM t WHERE c IN ('','');
+SET sql_mode='', optimizer_where_cost=1,big_tables=1,in_predicate_conversion_threshold=2;
+SELECT * FROM t WHERE c IN ('','');
+DROP TABLE t;
+
+--echo #
--echo # End of 11.0 tests
--echo #