mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
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
This commit is contained in:
parent
e0da8f43d2
commit
130c26a02a
3 changed files with 18 additions and 2 deletions
|
@ -584,3 +584,10 @@ set @@global.character_set_filesystem=default;
|
||||||
select @@global.character_set_filesystem;
|
select @@global.character_set_filesystem;
|
||||||
@@global.character_set_filesystem
|
@@global.character_set_filesystem
|
||||||
binary
|
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
|
||||||
|
|
|
@ -472,4 +472,12 @@ select @@character_set_filesystem;
|
||||||
set @@global.character_set_filesystem=default;
|
set @@global.character_set_filesystem=default;
|
||||||
select @@global.character_set_filesystem;
|
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
|
||||||
|
|
|
@ -993,7 +993,8 @@ struct show_var_st init_vars[]= {
|
||||||
#ifdef HAVE_SYS_UN_H
|
#ifdef HAVE_SYS_UN_H
|
||||||
{"socket", (char*) &mysqld_unix_port, SHOW_CHAR_PTR},
|
{"socket", (char*) &mysqld_unix_port, SHOW_CHAR_PTR},
|
||||||
#endif
|
#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},
|
{sys_sql_mode.name, (char*) &sys_sql_mode, SHOW_SYS},
|
||||||
{"sql_notes", (char*) &sys_sql_notes, SHOW_BOOL},
|
{"sql_notes", (char*) &sys_sql_notes, SHOW_BOOL},
|
||||||
{"sql_warnings", (char*) &sys_sql_warnings, SHOW_BOOL},
|
{"sql_warnings", (char*) &sys_sql_warnings, SHOW_BOOL},
|
||||||
|
|
Loading…
Reference in a new issue