diff options
| author | monty@mashka.mysql.fi <> | 2003-10-14 16:34:09 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-14 16:34:09 +0300 |
| commit | e71b53a8fec86ee65c136a9447b56361cbf918fb (patch) | |
| tree | fdb204f80367a263e33eecdadf745cf9da5f66e1 /mysql-test/r/variables.result | |
| parent | 461d1627b3323935345b13fe523f93dc74de9f36 (diff) | |
| parent | 2d3840f55073f2b8504fe3f543270fb6b18fc1ea (diff) | |
| download | mariadb-git-e71b53a8fec86ee65c136a9447b56361cbf918fb.tar.gz | |
merge with 4.0 to get fix for SET enum_system_variable=NULL
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 30eb18dc7ed..3674d058bee 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -234,6 +234,8 @@ set myisam_max_sort_file_size=100; ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL set myisam_max_extra_sort_file_size=100; ERROR HY000: Variable 'myisam_max_extra_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL +set @@SQL_WARNINGS=NULL; +ERROR HY000: Variable 'sql_warnings' can't be set to the value of 'NULL' set autocommit=1; set big_tables=1; select @@autocommit, @@big_tables; |