diff options
| author | unknown <jimw@mysql.com> | 2006-04-26 11:34:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-26 11:34:45 -0700 |
| commit | 19cae2e6999719b39041caee2c71e05923d44ddb (patch) | |
| tree | 77ea99fc16af04d62e8c80f05dc6d16862d75c1c /mysql-test/r/variables.result | |
| parent | 7ab5d5a75ee3a8e164a077d6c94122e10b42feaf (diff) | |
| parent | a4b042c1e6aa2dfe9a1be2e4181e7de19a34ce52 (diff) | |
| download | mariadb-git-19cae2e6999719b39041caee2c71e05923d44ddb.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 269a9bfdbd9..91e3c63da7e 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -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 |