Commit 6f1a4fe4 authored by unknown's avatar unknown
Browse files

After merge fixes 


mysql-test/t/rpl_charset.test:
  I have no idea why the automatic merge changed these, but now I have changed it back
parent 76f9049e

mysql-test/r/mysqldump.result

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ create view v1 as select * from t1; 
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) default NULL
@@ -385,6 +386,7 @@ CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` fro 
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



drop view v1;

drop table t1;

mysql-test/t/rpl_charset.test

+4 −4
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ connection master; 
set character_set_client=latin1, collation_connection=latin1_german1_ci;

truncate table t1;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Müller","Muffler"));

insert into t1 (b) values(LEAST("Mller","Muffler"));

set collation_connection=latin1_german2_ci;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Müller","Muffler"));

insert into t1 (b) values(LEAST("Mller","Muffler"));

--disable_query_log

select "--- --master--" as "";

--enable_query_log
@@ -90,7 +90,7 @@ select * from mysqltest2.t1 order by a; 
# which provokes error messages (like 'Illegal mix of collation') when

# we replay the master's INSERT/etc statements.

connection master;

set @a= _cp850 'Müller' collate cp850_general_ci;

set @a= _cp850 'Mller' collate cp850_general_ci;

truncate table t1;

insert into t1 (b) values(collation(@a));

--disable_query_log
@@ -145,7 +145,7 @@ CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255)); 
SET CHARACTER_SET_CLIENT=koi8r,

 CHARACTER_SET_CONNECTION=cp1251, 

 CHARACTER_SET_RESULTS=koi8r;

INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');

INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');

select hex(c1), hex(c2) from t1;

sync_slave_with_master;

select hex(c1), hex(c2) from t1;