diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
commit | 077e7c9a87df7ccb1e665a59838fd4054dc04719 (patch) | |
tree | 47cd0f017d8fe7dc11238110ab3745bdc9179272 /mysql-test/suite/rpl_ndb | |
parent | 2cdad6c3eb353cc4d986c274caad2dad5eaa6494 (diff) | |
parent | 22be2783f2cc61c2190b2cc9eed7f5d35856ce55 (diff) | |
download | mariadb-git-077e7c9a87df7ccb1e665a59838fd4054dc04719.tar.gz |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Diffstat (limited to 'mysql-test/suite/rpl_ndb')
-rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result | 35 | ||||
-rw-r--r-- | mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test | 6 |
2 files changed, 41 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result new file mode 100644 index 00000000000..473cd63169c --- /dev/null +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result @@ -0,0 +1,35 @@ +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; +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; +CREATE TABLE t1 (c1 BIT, c2 INT) Engine=NDB; +INSERT INTO `t1` VALUES ( 1, 1 ); +UPDATE t1 SET c1=NULL where c2=1; +Comparing tables master:test.t1 and slave:test.t1 +DELETE FROM t1 WHERE c2=1 LIMIT 1; +Comparing tables master:test.t1 and slave:test.t1 +DROP TABLE t1; +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; +CREATE TABLE t1 (c1 CHAR) Engine=NDB; +INSERT INTO t1 ( c1 ) VALUES ( 'w' ) ; +SELECT * FROM t1; +c1 +w +UPDATE t1 SET c1=NULL WHERE c1='w'; +Comparing tables master:test.t1 and slave:test.t1 +DELETE FROM t1 LIMIT 2; +Comparing tables master:test.t1 and slave:test.t1 +DROP TABLE t1; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test new file mode 100644 index 00000000000..454807d9591 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test @@ -0,0 +1,6 @@ +-- source include/have_ndb.inc +-- source include/have_binlog_format_mixed_or_row.inc +-- source include/ndb_master-slave.inc + +-- let $engine= NDB +-- source extra/rpl_tests/rpl_set_null.test |