summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2006-04-26 09:21:53 -0700
committerunknown <jimw@mysql.com>2006-04-26 09:21:53 -0700
commit130c26a02a4f4f268a56b07f9c5aede1f151c6fa (patch)
treeee52488cbef3990eee22a5c2404a76d347943fd8 /mysql-test
parente0da8f43d238171b29d4349fc7d1a3fadfa9da10 (diff)
downloadmariadb-git-130c26a02a4f4f268a56b07f9c5aede1f151c6fa.tar.gz
Bug #17849: sql_big_selects not shown in SHOW VARIABLES output
This patch simply adds sql_big_selects to the list of variables output by SHOW VARIABLES. mysql-test/r/variables.result: Update results mysql-test/t/variables.test: Add new regression test (and make end-of-tests marker add output) sql/set_var.cc: Add sql_big_selects to SHOW VARIABLES output
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/variables.result7
-rw-r--r--mysql-test/t/variables.test10
2 files changed, 16 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 1d1c76ab3fe..269a9bfdbd9 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -584,3 +584,10 @@ set @@global.character_set_filesystem=default;
select @@global.character_set_filesystem;
@@global.character_set_filesystem
binary
+set @old_sql_big_selects = @@sql_big_selects;
+set @@sql_big_selects = 1;
+show variables like 'sql_big_selects';
+Variable_name Value
+sql_big_selects ON
+set @@sql_big_selects = @old_sql_big_selects;
+End of 5.0 tests
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 8d8dc7896df..5b8db2f8786 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -472,4 +472,12 @@ select @@character_set_filesystem;
set @@global.character_set_filesystem=default;
select @@global.character_set_filesystem;
-# End of 5.0 tests
+#
+# Bug #17849: Show sql_big_selects in SHOW VARIABLES
+#
+set @old_sql_big_selects = @@sql_big_selects;
+set @@sql_big_selects = 1;
+show variables like 'sql_big_selects';
+set @@sql_big_selects = @old_sql_big_selects;
+
+--echo End of 5.0 tests