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/r/variables.result | |
| 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/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 1d1c76ab3fe..77b3b54c861 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -275,7 +275,7 @@ ERROR HY000: Variable 'autocommit' is a SESSION variable and can't be used with select @@global.timestamp; ERROR HY000: Variable 'timestamp' is a SESSION variable set @@version=''; -ERROR HY000: Unknown system variable 'version' +ERROR HY000: Variable 'version' is a read only variable set @@concurrent_insert=1; ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL set @@global.sql_auto_is_null=1; @@ -384,6 +384,7 @@ select @@sql_max_join_size,@@max_join_size; set sql_quote_show_create=1; set sql_safe_updates=1; set sql_select_limit=1; +set sql_select_limit=default; set sql_warnings=1; set global table_cache=100; set storage_engine=myisam; @@ -584,3 +585,11 @@ set @@global.character_set_filesystem=default; select @@global.character_set_filesystem; @@global.character_set_filesystem binary +select @@system_time_zone; +@@system_time_zone +# +select @@version, @@version_comment, @@version_compile_machine, +@@version_compile_os; +@@version @@version_comment @@version_compile_machine @@version_compile_os +# # # # +End of 5.0 tests |