diff options
| author | unknown <jimw@mysql.com> | 2006-04-26 15:29:32 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-26 15:29:32 -0700 |
| commit | c09e213b6141bef68769c170932495223d80a4e9 (patch) | |
| tree | f098e5d240ab20c015f3b2d9adecc8825afafe2f /mysql-test/t/variables.test | |
| parent | 2d85fd80835564e540a7e2d350b756c65a447a86 (diff) | |
| parent | 8d52b8a6b7d2d22960451c01f3a00c7c6ad12b81 (diff) | |
| download | mariadb-git-c09e213b6141bef68769c170932495223d80a4e9.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 8d8dc7896df..d6bebe8b5cb 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -169,7 +169,7 @@ set collation_connection=NULL; set global autocommit=1; --error 1238 select @@global.timestamp; ---error 1193 +--error 1238 set @@version=''; --error 1229 set @@concurrent_insert=1; @@ -258,6 +258,8 @@ select @@sql_max_join_size,@@max_join_size; set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; +# reset it, so later tests don't get confused +set sql_select_limit=default; set sql_warnings=1; set global table_cache=100; set storage_engine=myisam; @@ -472,4 +474,38 @@ select @@character_set_filesystem; set @@global.character_set_filesystem=default; select @@global.character_set_filesystem; -# End of 5.0 tests +# +# Bug #17849: Show sql_big_selects in SHOW VARIABLES +# +set @old_sql_big_selects = @@sql_big_selects; +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'; + +# +# Bug #12792: @@system_time_zone is not SELECTable. +# +# Don't actually output, since it depends on the system +--replace_column 1 # +select @@system_time_zone; + +# +# Bug #15684: system variables cannot be SELECTed (e.g. @@version_comment) +# +# Don't actually output, since it depends on the system +--replace_column 1 # 2 # 3 # 4 # +select @@version, @@version_comment, @@version_compile_machine, + @@version_compile_os; + +--echo End of 5.0 tests |