bk commit into 5.0 tree (jimw:1.2087) BUG#16195

[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.2087 06/04/20 20:41:12 jimw@stripped +3 -0
  Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values
  
    SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
    are system variables that need SHOW_SYS to be used.

  sql/set_var.cc
    1.154 06/04/20 20:41:08 jimw@stripped +2 -2
    Fix display of sql_notes and sql_warnings in SHOW VARIABLES.

  mysql-test/t/variables.test
    1.56 06/04/20 20:41:08 jimw@stripped +12 -1
    Add new regression test

  mysql-test/r/variables.result
    1.80 06/04/20 20:41:08 jimw@stripped +15 -0
    Add new 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-16195

--- 1.79/mysql-test/r/variables.result	2006-02-13 20:23:44 -08:00
+++ 1.80/mysql-test/r/variables.result	2006-04-20 20:41:08 -07:00
@@ -584,3 +584,18 @@
 select @@global.character_set_filesystem;
 @@global.character_set_filesystem
 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

--- 1.55/mysql-test/t/variables.test	2006-03-22 07:47:41 -08:00
+++ 1.56/mysql-test/t/variables.test	2006-04-20 20:41:08 -07:00
@@ -472,4 +472,15 @@
 set @@global.character_set_filesystem=default;
 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

--- 1.153/sql/set_var.cc	2006-04-13 00:25:52 -07:00
+++ 1.154/sql/set_var.cc	2006-04-20 20:41:08 -07:00
@@ -989,8 +989,8 @@
 #endif
   {sys_sort_buffer.name,      (char*) &sys_sort_buffer, 	    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},
+  {"sql_notes",               (char*) &sys_sql_notes,               SHOW_SYS},
+  {"sql_warnings",            (char*) &sys_sql_warnings,            SHOW_SYS},
   {sys_storage_engine.name,   (char*) &sys_storage_engine,          SHOW_SYS},
   {sys_sync_frm.name,         (char*) &sys_sync_frm,               SHOW_SYS},
 #ifdef HAVE_TZNAME