diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
| commit | 564952afb01fa9ff1d6f4622c0f4fb35ccc037cb (patch) | |
| tree | 85bcbfa3559990f90ce21638ed46531ed888aaa3 /mysql-test/r/variables.result | |
| parent | ffde6bbb15b75c94293784fa0f4264d64039f0b9 (diff) | |
| parent | bcaa7524d935464c68e34cb0657cd43517108c40 (diff) | |
| download | mariadb-git-564952afb01fa9ff1d6f4622c0f4fb35ccc037cb.tar.gz | |
Automerge from mysql-next-mr.
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index b907411924e..0a999fb18f3 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -812,16 +812,16 @@ select @@lc_time_names; @@lc_time_names en_US LC_TIME_NAMES: testing locale with the last ID: -set lc_time_names=108; +set lc_time_names=109; select @@lc_time_names; @@lc_time_names -zh_HK +el_GR LC_TIME_NAMES: testing a number beyond the valid ID range: -set lc_time_names=109; -ERROR HY000: Unknown locale: '109' +set lc_time_names=110; +ERROR HY000: Unknown locale: '110' select @@lc_time_names; @@lc_time_names -zh_HK +el_GR LC_TIME_NAMES: testing that 0 is en_US: set lc_time_names=0; select @@lc_time_names; @@ -864,7 +864,7 @@ select @@query_prealloc_size = @test; @@query_prealloc_size = @test 1 set global sql_mode=repeat('a',80); -ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +ERROR 42000: Variable 'sql_mode' can't be set to the value of 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' End of 4.1 tests create table t1 (a int); select a into @x from t1; @@ -1176,18 +1176,18 @@ ERROR HY000: Variable 'init_file' is a read only variable SET @@global.init_file= 'x'; ERROR HY000: Variable 'init_file' is a read only variable # -SHOW VARIABLES like 'language'; +SHOW VARIABLES like 'lc_messages_dir'; Variable_name Value -language # -SELECT @@session.language; -ERROR HY000: Variable 'language' is a GLOBAL variable -SELECT @@global.language; -@@global.language +lc_messages_dir # +SELECT @@session.lc_messages_dir; +ERROR HY000: Variable 'lc_messages_dir' is a GLOBAL variable +SELECT @@global.lc_messages_dir; +@@global.lc_messages_dir # -SET @@session.language= 'x'; -ERROR HY000: Variable 'language' is a read only variable -SET @@global.language= 'x'; -ERROR HY000: Variable 'language' is a read only variable +SET @@session.lc_messages_dir= 'x'; +ERROR HY000: Variable 'lc_messages_dir' is a read only variable +SET @@global.lc_messages_dir= 'x'; +ERROR HY000: Variable 'lc_messages_dir' is a read only variable # SHOW VARIABLES like 'large_page_size'; Variable_name Value |