Commit a71f298f authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
parents 39c20516 80dc1ee7

mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test

+1 −0
Original line number Diff line number Diff line
@@ -342,5 +342,6 @@ SHOW CREATE TABLE t1; 
--echo --- Do Cleanup ---



DROP TABLE IF EXISTS t1;

sync_slave_with_master;



# End of 5.1 test case

mysql-test/include/ctype_german.inc

0 → 100644
+40 −0
Original line number Diff line number Diff line 
#

# Bug #27877 incorrect german order in utf8_general_ci

#

# Testing if "SHARP S" is equal to "S",

# like in latin1_german1_ci, utf8_general_ci, ucs2_general_ci

# Or if "SHART S" is equal to "SS",

# like in latin1_german2_ci, utf8_unicode_ci, ucs2_unicode_ci

# 

# Also testing A-uml, O-uml, U-uml

#



--disable_warnings

drop table if exists t1;

--enable_warnings



#

# Create a table with a varchar(x) column,

# using current values of

# @@character_set_connection and  @@collation_connection.

#



create table t1 as select repeat(' ', 64) as s1;

select collation(s1) from t1;

delete from t1;



#

# Populate data

#



insert into t1 values ('a'),('ae'),(_latin1 0xE4);

insert into t1 values ('o'),('oe'),(_latin1 0xF6);

insert into t1 values ('s'),('ss'),(_latin1 0xDF);

insert into t1 values ('u'),('ue'),(_latin1 0xFC);



#

# Check order

#

select s1, hex(s1) from t1 order by s1, binary s1;

select group_concat(s1 order by binary s1) from t1 group by s1;

drop table t1;

mysql-test/lib/mtr_report.pl

+5 −0
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ sub mtr_report_stats ($) { 
		 (/Failed to write to mysql\.\w+_log/

		 )) or



		# rpl_bug33931 has deliberate failures

		($testname eq 'rpl.rpl_bug33931' and

		 (/Failed during slave.*thread initialization/

		  )) or



		# rpl_temporary has an error on slave that can be ignored

		($testname eq 'rpl.rpl_temporary' and

		 (/Slave: Can\'t find record in \'user\' Error_code: 1032/

mysql-test/r/ctype_latin1_de.result

+35 −0
Original line number Diff line number Diff line
@@ -326,6 +326,41 @@ latin1_german2_ci 6109 
latin1_german2_ci	61

latin1_german2_ci	6120

drop table t1;

drop table if exists t1;

create table t1 as select repeat(' ', 64) as s1;

select collation(s1) from t1;

collation(s1)

latin1_german2_ci

delete from t1;

insert into t1 values ('a'),('ae'),(_latin1 0xE4);

insert into t1 values ('o'),('oe'),(_latin1 0xF6);

insert into t1 values ('s'),('ss'),(_latin1 0xDF);

insert into t1 values ('u'),('ue'),(_latin1 0xFC);

select s1, hex(s1) from t1 order by s1, binary s1;

s1	hex(s1)

a	61

ae	6165

	E4

o	6F

oe	6F65

	F6

s	73

ss	7373

	DF

u	75

ue	7565

	FC

select group_concat(s1 order by binary s1) from t1 group by s1;

group_concat(s1 order by binary s1)

a

ae,

o

oe,

s

ss,

u

ue,

drop table t1;

SET NAMES latin1;

CREATE TABLE t1 (

col1 varchar(255) NOT NULL default ''

mysql-test/r/ctype_uca.result

+35 −0
Original line number Diff line number Diff line
@@ -2647,6 +2647,41 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

drop table if exists t1;

create table t1 as select repeat(' ', 64) as s1;

select collation(s1) from t1;

collation(s1)

utf8_unicode_ci

delete from t1;

insert into t1 values ('a'),('ae'),(_latin1 0xE4);

insert into t1 values ('o'),('oe'),(_latin1 0xF6);

insert into t1 values ('s'),('ss'),(_latin1 0xDF);

insert into t1 values ('u'),('ue'),(_latin1 0xFC);

select s1, hex(s1) from t1 order by s1, binary s1;

s1	hex(s1)

a	61

ä	C3A4

ae	6165

o	6F

ö	C3B6

oe	6F65

s	73

ss	7373

ß	C39F

u	75

ü	C3BC

ue	7565

select group_concat(s1 order by binary s1) from t1 group by s1;

group_concat(s1 order by binary s1)

a,ä

ae

o,ö

oe

s

ss,ß

u,ü

ue

drop table t1;

CREATE TABLE t1 (id int, a varchar(30) character set utf8);

INSERT INTO t1 VALUES (1, _ucs2 0x01310069), (2, _ucs2 0x01310131);

INSERT INTO t1 VALUES (3, _ucs2 0x00690069), (4, _ucs2 0x01300049);