diff options
| author | unknown <jimw@mysql.com> | 2006-04-20 21:56:53 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-20 21:56:53 -0700 |
| commit | 4e5bed78dfbc83cb0a27c85b1994139eb794f842 (patch) | |
| tree | c746c68082e601626ce22b90ba8ec59c58842af2 /mysql-test/t/variables.test | |
| parent | d8df724af26fc3cd1d6aa5567173402102cf8493 (diff) | |
| download | mariadb-git-4e5bed78dfbc83cb0a27c85b1994139eb794f842.tar.gz | |
Bug #12792: @@system_time_zone is not SELECTable
Bug #15684: @@version_* are not all SELECTable
Added the appropriate information as read-only system variables, and
also removed some special-case handling of @@version along the way.
@@version_bdb was added, but isn't included in the test because it
depends on the presence of BDB.
mysql-test/r/variables.result:
Update results
mysql-test/t/variables.test:
Fix error from setting @@version, reset sql_select_limit to avoid confusion
in later tests, and add new regression tests.
sql/item_func.cc:
Remove special-case handling of VERSION, it's just a read-only server
variable like the others now.
sql/set_var.cc:
Add system_time_zone and various version-related system variables
Diffstat (limited to 'mysql-test/t/variables.test')
| -rw-r--r-- | mysql-test/t/variables.test | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 8d8dc7896df..fde352efa7b 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,19 @@ select @@character_set_filesystem; set @@global.character_set_filesystem=default; select @@global.character_set_filesystem; -# End of 5.0 tests +# +# 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 |