bk commit into 5.0 tree (jimw:1.2105) BUG#17849

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2105 06/04/26 09:21:53 jimw@stripped +3 -0
  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.

  sql/set_var.cc
    1.155 06/04/26 09:21:50 jimw@stripped +2 -1
    Add sql_big_selects to SHOW VARIABLES output

  mysql-test/t/variables.test
    1.56 06/04/26 09:21:50 jimw@stripped +9 -1
    Add new regression test (and make end-of-tests marker add output)

  mysql-test/r/variables.result
    1.80 06/04/26 09:21:50 jimw@stripped +7 -0
    Update results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.79/mysql-test/r/variables.result	2006-02-13 20:23:44 -08:00
+++ 1.80/mysql-test/r/variables.result	2006-04-26 09:21:50 -07:00
@@ -584,3 +584,10 @@
 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

--- 1.55/mysql-test/t/variables.test	2006-03-22 07:47:41 -08:00
+++ 1.56/mysql-test/t/variables.test	2006-04-26 09:21:50 -07:00
@@ -472,4 +472,12 @@
 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

--- 1.154/sql/set_var.cc	2006-04-26 08:55:23 -07:00
+++ 1.155/sql/set_var.cc	2006-04-26 09:21:50 -07:00
@@ -993,7 +993,8 @@
 #ifdef HAVE_SYS_UN_H
   {"socket",                  (char*) &mysqld_unix_port,             SHOW_CHAR_PTR},
 #endif
-  {sys_sort_buffer.name,      (char*) &sys_sort_buffer, 	    SHOW_SYS},
+  {sys_sort_buffer.name,      (char*) &sys_sort_buffer,             SHOW_SYS},
+  {sys_big_selects.name,      (char*) &sys_big_selects,             SHOW_SYS},
   {sys_sql_mode.name,         (char*) &sys_sql_mode,                SHOW_SYS},
   {"sql_notes",               (char*) &sys_sql_notes,               SHOW_BOOL},
   {"sql_warnings",            (char*) &sys_sql_warnings,            SHOW_BOOL},