1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
unknown 2004-07-06 10:45:53 +02:00
commit 82912d989c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/rpl_charset.result
View File

@ -25,19 +25,19 @@ test2 CREATE DATABASE `test2` /*!40100 DEFAULT CHARACTER SET latin2 */
show create database test3; show create database test3;
Database Create Database Database Create Database
test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET latin5 */ test3 CREATE DATABASE `test3` /*!40100 DEFAULT CHARACTER SET latin5 */
set @@collation_server=armscii_bin; set @@collation_server=armscii8_bin;
drop database test3; drop database test3;
create database test3; create database test3;
--- --master-- --- --master--
show create database test3; show create database test3;
Database Create Database 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-- --- --slave--
show create database test3; show create database test3;
Database Create Database 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; use test2;
create table t1 (a int auto_increment primary key, b varchar(100)); create table t1 (a int auto_increment primary key, b varchar(100));
set character_set_client=cp850, collation_connection=latin2_croatian_ci; 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; select * from t1 order by a;
a b a b
1 armscii8 1 armscii8
2 armscii_bin 2 armscii8_bin
3 cp850 3 cp850
4 latin2 4 latin2
5 latin2_croatian_ci 5 latin2_croatian_ci
@ -60,7 +60,7 @@ a b
select * from test2.t1 order by a; select * from test2.t1 order by a;
a b a b
1 armscii8 1 armscii8
2 armscii_bin 2 armscii8_bin
3 cp850 3 cp850
4 latin2 4 latin2
5 latin2_croatian_ci 5 latin2_croatian_ci

2
mysql-test/t/rpl_charset.test
View File

@ -26,7 +26,7 @@ show create database test2;
show create database test3; show create database test3;
connection master; connection master;
set @@collation_server=armscii_bin; set @@collation_server=armscii8_bin;
drop database test3; drop database test3;
create database test3; create database test3;
--disable_query_log --disable_query_log