diff options
| author | unknown <lars@mysql.com> | 2005-02-23 00:50:30 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-23 00:50:30 +0100 |
| commit | 6f1a4fe4512ab96c10f72eb873c24a930582a8a1 (patch) | |
| tree | 4cbe6ba7cb00e4474a78016d350ab87011a36c8f | |
| parent | 76f9049eaf093026586bb4e087b50b42ca10c24d (diff) | |
| download | mariadb-git-6f1a4fe4512ab96c10f72eb873c24a930582a8a1.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/mysqldump.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_charset.test | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 0854fb5f50f..d8d9e60acd1 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -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; diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index 92582f9d748..d2c195dfdbf 100644 --- a/mysql-test/t/rpl_charset.test +++ b/mysql-test/t/rpl_charset.test @@ -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; |