summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables.test
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-04-23 18:19:22 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-04-23 18:19:22 +0500
commitbb12690ad7db28b2c7a85b4b943df4d4174418c4 (patch)
tree563e2fced4c06e8728790984dd7f333b818047c7 /mysql-test/t/variables.test
parentfbf47d52345c33add48702e43fe2f87cc9fcfecb (diff)
downloadmariadb-git-bb12690ad7db28b2c7a85b4b943df4d4174418c4.tar.gz
Variable names have been renamed:
client_collation -> collation_client result_collation -> collation_results connection_collation -> collation_connection BitKeeper/etc/ignore: Added client/ssl_test to the ignore list
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r--mysql-test/t/variables.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index bb94ab17b77..d1c8df64be2 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -92,7 +92,7 @@ set net_buffer_length=2000000000;
show variables like 'net_buffer_length';
set character set cp1251_koi8;
-show variables like "client_collation";
+show variables like "collation_client";
select @@timestamp>0;
set @@rand_seed1=10000000,@@rand_seed2=1000000;
@@ -119,7 +119,7 @@ set SESSION query_cache_size=10000;
--error 1230
set GLOBAL table_type=DEFAULT;
--error 1115
-set client_collation=UNKNOWN_CHARACTER_SET;
+set collation_client=UNKNOWN_CHARACTER_SET;
--error 1228
set global autocommit=1;
--error 1228