summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2014-09-24 23:52:17 +0300
committerMonty <monty@mariadb.org>2014-09-24 23:52:17 +0300
commit3f2d9a902ec93327515ae94ae0c8c0c2c485d15f (patch)
treec3951ee84a07c711e6bb2af784415d02a87f7eb7
parentf5d845426eb38f0b5641c30d0d3a56c2b6a2b6a0 (diff)
downloadmariadb-git-3f2d9a902ec93327515ae94ae0c8c0c2c485d15f.tar.gz
Fixed failing test temp_table_frm
The problem was that the internal temporary table created for information_schema overflow to MyISAM because it has a row width of > 3000 characters, which filled the in memory temporary tables. Fix was to increase size for the heap table.
-rw-r--r--mysql-test/r/temp_table_frm.result1
-rw-r--r--mysql-test/t/temp_table_frm.test3
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/temp_table_frm.result b/mysql-test/r/temp_table_frm.result
index ff809957a3d..4f60ccc32c8 100644
--- a/mysql-test/r/temp_table_frm.result
+++ b/mysql-test/r/temp_table_frm.result
@@ -1,3 +1,4 @@
+set @@session.max_heap_table_size=16*1024*1024;
create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
create temporary table t2 (a int) engine=memory;
select variable_name, session_status.variable_value - t1.variable_value
diff --git a/mysql-test/t/temp_table_frm.test b/mysql-test/t/temp_table_frm.test
index f78de71a756..178bd15004b 100644
--- a/mysql-test/t/temp_table_frm.test
+++ b/mysql-test/t/temp_table_frm.test
@@ -1,6 +1,9 @@
#
# MDEV-4260 Don't create frm files for temporary tables
#
+
+# Ensure we don't overflow the internal heap table size in the join
+set @@session.max_heap_table_size=16*1024*1024;
create table t1 select * from information_schema.session_status where variable_name like 'Opened%';
create temporary table t2 (a int) engine=memory;
select variable_name, session_status.variable_value - t1.variable_value