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/t/variables.test | |
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/t/variables.test')
-rw-r--r-- | mysql-test/t/variables.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 8f29528ac25..4d97f380dff 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -562,7 +562,6 @@ select @@lc_time_names; select @@global.lc_time_names, @@lc_time_names; set @@global.lc_time_names=fr_FR; select @@global.lc_time_names, @@lc_time_names; ---echo New connection connect (con1,localhost,root,,); connection con1; select @@global.lc_time_names, @@lc_time_names; @@ -570,7 +569,6 @@ set @@lc_time_names=ru_RU; select @@global.lc_time_names, @@lc_time_names; disconnect con1; connection default; ---echo Returnung to default connection select @@global.lc_time_names, @@lc_time_names; set lc_time_names=default; select @@global.lc_time_names, @@lc_time_names; |