database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values

Browse Source 
SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
  are system variables that need SHOW_SYS to be used.
This commit is contained in:
jimw@mysql.com
2006-04-20 20:41:12 -07:00
parent b57eb9e17c
commit 4d392fb9f4
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/variables.result
View File

@ -584,3 +584,18 @@ 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 @@sql_notes = 0, @@sql_warnings = 0;
show variables like 'sql_notes';
Variable_name Value
sql_notes OFF
show variables like 'sql_warnings';
Variable_name Value
sql_warnings OFF
set @@sql_notes = 1, @@sql_warnings = 1;
show variables like 'sql_notes';
Variable_name Value
sql_notes ON
show variables like 'sql_warnings';
Variable_name Value
sql_warnings ON
End of 5.0 tests

13
mysql-test/t/variables.test
View File

@ -472,4 +472,15 @@ 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 #16195: SHOW VARIABLES doesn't report correctly sql_warnings and
# sql_notes values
#
set @@sql_notes = 0, @@sql_warnings = 0;
show variables like 'sql_notes';
show variables like 'sql_warnings';
set @@sql_notes = 1, @@sql_warnings = 1;
show variables like 'sql_notes';
show variables like 'sql_warnings';
--echo End of 5.0 tests

4
sql/set_var.cc
View File

@ -989,8 +989,8 @@ struct show_var_st init_vars[]= {
#endif #endif
{sys_sort_buffer.name, (char*) &sys_sort_buffer, SHOW_SYS}, {sys_sort_buffer.name, (char*) &sys_sort_buffer, 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_SYS},
{"sql_warnings", (char*) &sys_sql_warnings, SHOW_BOOL}, {"sql_warnings", (char*) &sys_sql_warnings, SHOW_SYS},
{sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS}, {sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS},
{sys_sync_frm.name, (char*) &sys_sync_frm, SHOW_SYS}, {sys_sync_frm.name, (char*) &sys_sync_frm, SHOW_SYS},
#ifdef HAVE_TZNAME #ifdef HAVE_TZNAME