bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3324)

[magnus.blaudd]

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@strippedrez

 3324 magnus.blaudd@stripped	2011-06-09
      ndb
       - update .result files for rpl_ndb test which depend on extra/rpl_tests

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2011-05-12 08:59:16 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2011-06-09 20:26:32 +0000
@@ -871,6 +871,25 @@ c1	hex(c4)	c5
 2	6231623162316231	JOE
 3	6231623162316231	QA
 DROP TABLE t5;
+
+include/rpl_reset.inc
+SET NAMES utf8;
+SET SQL_LOG_BIN=0;
+CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(255) CHARACTER SET UTF8 NOT NULL) ENGINE='NDB';
+SET SQL_LOG_BIN=1;
+CREATE TABLE t1 (c1 INT) ENGINE='NDB';
+INSERT INTO t1 VALUES ();
+SET @text= REPEAT(_utf8'ç', 255);
+INSERT INTO t1 VALUES (1, @text);
+SELECT * FROM t1;
+c1	c2
+1	ççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç
+0	
+SELECT * FROM t1;
+c1
+0
+1
+DROP TABLE t1;
 set binlog_format=mixed;
 
 ***********************************************************
@@ -1742,4 +1761,23 @@ c1	hex(c4)	c5
 2	6231623162316231	JOE
 3	6231623162316231	QA
 DROP TABLE t5;
+
+include/rpl_reset.inc
+SET NAMES utf8;
+SET SQL_LOG_BIN=0;
+CREATE TABLE t1 (c1 INT NOT NULL, c2 CHAR(255) CHARACTER SET UTF8 NOT NULL) ENGINE='NDB';
+SET SQL_LOG_BIN=1;
+CREATE TABLE t1 (c1 INT) ENGINE='NDB';
+INSERT INTO t1 VALUES ();
+SET @text= REPEAT(_utf8'ç', 255);
+INSERT INTO t1 VALUES (1, @text);
+SELECT * FROM t1;
+c1	c2
+1	ççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççççç
+0	
+SELECT * FROM t1;
+c1
+0
+1
+DROP TABLE t1;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-05-10 12:32:21 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-06-09 20:26:32 +0000
@@ -1,6 +1,6 @@
 include/master-slave.inc
 [connection master]
-call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
 **** Diff Table Def Start ****
 *** On Slave ***

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2011-04-15 11:41:33 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result	2011-06-09 20:26:32 +0000
@@ -120,10 +120,10 @@ i	j	x	y	z
 DROP TABLE t1, t2, t3;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 DROP TABLE IF EXISTS t2;
 Warnings:
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t2'
 CREATE TABLE t1 (
 idp int(11) NOT NULL default '0',
 idpro int(11) default NULL,

Attachment: [text/bzr-bundle] bzr/[e-mail]