diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-14 16:34:09 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-14 16:34:09 +0300 |
| commit | 086ec556f87701cad20a75031d7fb1ab3cd3b350 (patch) | |
| tree | fdb204f80367a263e33eecdadf745cf9da5f66e1 /mysql-test/t/variables.test | |
| parent | 3974119b5f1a735d4087105eb8c07f241a70f64b (diff) | |
| parent | d1ed51db824c8335dc6b4617d09b600f3c918506 (diff) | |
| download | mariadb-git-086ec556f87701cad20a75031d7fb1ab3cd3b350.tar.gz | |
merge with 4.0 to get fix for SET enum_system_variable=NULL
BitKeeper/etc/ignore:
auto-union
mysql-test/t/variables.test:
Auto merged
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 7b5456e1895..396fb3ac722 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -150,6 +150,8 @@ select @@global.sql_auto_is_null; set myisam_max_sort_file_size=100; --error 1229 set myisam_max_extra_sort_file_size=100; +--error 1231 +set @@SQL_WARNINGS=NULL; # Test setting all variables |