summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-04-01 18:54:01 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-04-01 18:54:01 +0500
commit2c7fdb5d20c0385e522ca456ea07494186e9e1a5 (patch)
tree497736f0d47e0951f240511e7e6af21e20619da3 /mysql-test/r/variables.result
parentcc2c0b6df36577194da702cd4ed98dc14b377987 (diff)
downloadmariadb-git-2c7fdb5d20c0385e522ca456ea07494186e9e1a5.tar.gz
Some collation have been renamed to fit into convension
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 4b3046770dc..0693eedf55a 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -158,15 +158,15 @@ net_buffer_length 1048576
set GLOBAL character set cp1251_koi8;
show global variables like "client_collation";
Variable_name Value
-client_collation cp1251
+client_collation cp1251_bulgarian_ci
set character set cp1251_koi8;
show variables like "client_collation";
Variable_name Value
-client_collation cp1251
+client_collation cp1251_bulgarian_ci
set global character set default, session character set default;
show variables like "client_collation";
Variable_name Value
-client_collation latin1
+client_collation latin1_swedish_ci
select @@timestamp>0;
@@timestamp>0
1