Commit 130c26a0 authored by unknown's avatar unknown
Browse files

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
parent e0da8f43

mysql-test/r/variables.result

+7 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/variables.test

+9 −1
Original line number Diff line number Diff line
@@ -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

sql/set_var.cc

+2 −1
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ struct show_var_st init_vars[]= { 
  {"socket",                  (char*) &mysqld_unix_port,             SHOW_CHAR_PTR},

#endif

  {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},