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

Merge mysql.com:/home/jimw/my/mysql-5.0-16195

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict
This commit is contained in:
unknown
2006-04-26 11:34:45 -07:00
parent 7ab5d5a75e a4b042c1e6
commit 19cae2e699
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,4 +590,18 @@ show variables like 'sql_big_selects';
Variable_name Value Variable_name Value
sql_big_selects ON sql_big_selects ON
set @@sql_big_selects = @old_sql_big_selects; set @@sql_big_selects = @old_sql_big_selects;
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 End of 5.0 tests

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

@ -480,4 +480,15 @@ set @@sql_big_selects = 1;
show variables like 'sql_big_selects'; show variables like 'sql_big_selects';
set @@sql_big_selects = @old_sql_big_selects; set @@sql_big_selects = @old_sql_big_selects;
#
# 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 --echo End of 5.0 tests

4
sql/set_var.cc
View File

@ -996,8 +996,8 @@ struct show_var_st init_vars[]= {
{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_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_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},
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
{sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period, SHOW_SYS}, {sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period, SHOW_SYS},