Commit 19cae2e6 authored by unknown's avatar unknown
Browse files

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

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
parents 7ab5d5a7 a4b042c1

mysql-test/r/variables.result

+14 −0
Original line number Diff line number Diff line
@@ -590,4 +590,18 @@ show variables like 'sql_big_selects'; 
Variable_name	Value

sql_big_selects	ON

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

mysql-test/t/variables.test

+11 −0
Original line number Diff line number Diff line
@@ -480,4 +480,15 @@ set @@sql_big_selects = 1; 
show variables like '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

sql/set_var.cc

+2 −2
Original line number Diff line number Diff line
@@ -996,8 +996,8 @@ struct show_var_st init_vars[]= { 
  {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},

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

#ifdef HAVE_REPLICATION

  {sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period,     SHOW_SYS},