diff options
| author | unknown <bar@mysql.com> | 2004-07-06 13:43:15 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-07-06 13:43:15 +0500 |
| commit | 46f90a6a3e1d5ac7695e7481cfae99ee9e6407aa (patch) | |
| tree | 20b21a7c4433ee3e90d6e8fad16edbc9e533de5f /mysql-test/r/rpl_charset.result | |
| parent | 3e3a2e835b17b8d3790e11758e9ae30a75c4db39 (diff) | |
| download | mariadb-git-46f90a6a3e1d5ac7695e7481cfae99ee9e6407aa.tar.gz | |
rpl_charset.result, rpl_charset.test:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
mysql-test/t/rpl_charset.test:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
mysql-test/r/rpl_charset.result:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
Diffstat (limited to 'mysql-test/r/rpl_charset.result')
| -rw-r--r-- | mysql-test/r/rpl_charset.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result index 8d42957c9d3..d5f8ac4f293 100644 --- a/mysql-test/r/rpl_charset.result +++ b/mysql-test/r/rpl_charset.result @@ -25,19 +25,19 @@ test2 CREATE DATABASE `test2` /*!40100 DEFAULT CHARACTER SET latin2 */ show create database test3; Database Create Database test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET latin5 */ -set @@collation_server=armscii_bin; +set @@collation_server=armscii8_bin; drop database test3; create database test3; --- --master-- show create database test3; Database Create Database -test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii_bin */ +test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */ --- --slave-- show create database test3; Database Create Database -test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii_bin */ +test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */ use test2; create table t1 (a int auto_increment primary key, b varchar(100)); set character_set_client=cp850, collation_connection=latin2_croatian_ci; @@ -51,7 +51,7 @@ insert into t1 (b) values(@@collation_connection); select * from t1 order by a; a b 1 armscii8 -2 armscii_bin +2 armscii8_bin 3 cp850 4 latin2 5 latin2_croatian_ci @@ -60,7 +60,7 @@ a b select * from test2.t1 order by a; a b 1 armscii8 -2 armscii_bin +2 armscii8_bin 3 cp850 4 latin2 5 latin2_croatian_ci |