database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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

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

@ -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