diff options
| author | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-11-28 15:35:25 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-11-28 15:35:25 +0400 |
| commit | 7ed596398becf839238e02fc6e0b30a1b8dd2b54 (patch) | |
| tree | 5cf83e220595d3b69bd8c7263a931712516ec393 /mysql-test | |
| parent | 80b33c48b172cb017d3c17504c10a3c1931c8b0b (diff) | |
| download | mariadb-git-7ed596398becf839238e02fc6e0b30a1b8dd2b54.tar.gz | |
bug#29562 default collation of ucs2_unicode_ci crashes slave
Problem: some pieces of code relied on the default character
set settings, which didn't work in case of default character set
ucs2.
Fix: Specifying character set explicitly, not to depend on
the default settings.
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
Recording correct test result
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling test
sql/ha_ndbcluster_binlog.cc:
Character set of the NDB helper tables should
not rely of the default settings, to avoid creating
tables in different character sets on master and slave.
Adding explicit character set. UTF8 should be fine.
character_set_client should not rely on the default
character set settings, which can be ucs2. Helper SQL queries
sent by NDB are all in pure ASCII. Setting client_character_set
to latin1.
sql/log_event.cc:
Adding assert to make sure that binary log does not have
queries in character set which parser does not understand
(e.g. ucs2).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/rpl_ndb/t/disabled.def | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result index 2f9dc4ae616..75151f45419 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result @@ -1,3 +1,9 @@ +stop slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +start slave; show variables like 'collation_server'; Variable_name Value collation_server ucs2_unicode_ci @@ -5,5 +11,17 @@ show variables like "%character_set_ser%"; Variable_name Value character_set_server ucs2 DROP TABLE IF EXISTS t1; -create table t1 (a int); +create table t1 (a int) ENGINE=NDB; drop table t1; +CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0', +`nom` char(4) default NULL, +`prenom` char(4) default NULL, +PRIMARY KEY (`nid`)) +ENGINE=ndbcluster; +INSERT INTO t1 VALUES(1,"XYZ1","ABC1"); +select * from t1 order by nid; +nid nom prenom +1 XYZ1 ABC1 +select * from t1 order by nid; +nid nom prenom +1 XYZ1 ABC1 diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index 3832fe49cb9..3055a60f986 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -17,7 +17,6 @@ rpl_ndb_2other : BUG#21842 2007-08-30 tsmith test has never worked on rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB rpl_ndb_mix_innodb : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a -rpl_ndb_ctype_ucs2_def : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset rpl_ndb_extraColMaster : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open |