diff options
| author | unknown <bar@mysql.com> | 2007-04-09 18:06:27 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-04-09 18:06:27 +0500 |
| commit | 6d9d64baab8537e465659daab77d2a9fd1a286ff (patch) | |
| tree | ce446d2a642cfd3838c2a928a265568cd482c9be /mysql-test/r/variables.result | |
| parent | ec9b5eca9cee569eb4c1442cb0ab47c72dac818d (diff) | |
| parent | 2e302abc80ea82ba145289fb6951ccbbf51076b6 (diff) | |
| download | mariadb-git-6d9d64baab8537e465659daab77d2a9fd1a286ff.tar.gz | |
Merge mysql.com:/home/bar/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.1-new-rpl
client/mysql.cc:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 6927f07da6b..8d601596648 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -753,6 +753,37 @@ set lc_time_names=0; select @@lc_time_names; @@lc_time_names en_US +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +en_US en_US +set @@global.lc_time_names=fr_FR; +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +fr_FR en_US +New connection +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +fr_FR fr_FR +set @@lc_time_names=ru_RU; +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +fr_FR ru_RU +Returnung to default connection +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +fr_FR en_US +set lc_time_names=default; +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +fr_FR fr_FR +set @@global.lc_time_names=default; +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +en_US fr_FR +set @@lc_time_names=default; +select @@global.lc_time_names, @@lc_time_names; +@@global.lc_time_names @@lc_time_names +en_US en_US set @test = @@query_prealloc_size; set @@query_prealloc_size = @test; select @@query_prealloc_size = @test; |