diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/r/variables.result | |
parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
download | mariadb-git-10.2-connector-c-integ.tar.gz |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r-- | mysql-test/r/variables.result | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index fef3e4a3e9e..a38cf57189c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -822,7 +822,8 @@ 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 +connect con1,localhost,root,,; +connection con1; select @@global.lc_time_names, @@lc_time_names; @@global.lc_time_names @@lc_time_names fr_FR fr_FR @@ -830,7 +831,8 @@ 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 +disconnect con1; +connection default; select @@global.lc_time_names, @@lc_time_names; @@global.lc_time_names @@lc_time_names fr_FR en_US |