From 07fa8dd1e87e0e9c16494cd4c85f85b7cd29f373 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 11 Feb 2008 15:06:07 +0100 Subject: [PATCH] correcting wrong test case --- .../suite/rpl_ndb/r/rpl_ndb_2ndb.result | 25 +++++++++---------- .../suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt | 2 +- mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test | 1 - 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result index a28ec04fdf0..12882b28254 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result @@ -8,7 +8,6 @@ SET storage_engine=ndb; === NDB -> NDB === -SET storage_engine=ndb; --- Doing pre test cleanup --- DROP TABLE IF EXISTS t1; --- Create Table Section --- @@ -51,7 +50,7 @@ t1 CREATE TABLE `t1` ( `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 STOP SLAVE; RESET SLAVE; RESET MASTER; @@ -143,7 +142,7 @@ t1 CREATE TABLE `t1` ( `total` bigint(20) unsigned DEFAULT NULL, `y` year(4) DEFAULT NULL, `t` date DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 STOP SLAVE; RESET SLAVE; RESET MASTER; @@ -236,7 +235,7 @@ t1 CREATE TABLE `t1` ( `u` int(11) DEFAULT NULL, `v` char(16) DEFAULT 'default', PRIMARY KEY (`id`,`total`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 SELECT * FROM t1 ORDER BY id; @@ -267,14 +266,14 @@ select * from t1 order by id; id b1 vc bc d f total y t u v -2 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1965-11-14 NULL default +2 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1965-11-14 NULL NULL 3 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1905-11-14 7 default -4 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1985-11-14 NULL default +4 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1985-11-14 NULL NULL 20 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1965-11-14 7 explicit -42 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1905-11-14 NULL default +42 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1905-11-14 NULL NULL 50 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1985-11-14 NULL explicit -142 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1995-11-14 NULL default -412 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 2005-11-14 NULL default +142 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 1995-11-14 NULL NULL +412 1 Testing MySQL databases is a cool Must make it bug free for the customer 654321.4321 15.21 0 1965 2005-11-14 NULL NULL --- Perform basic operation on master --- --- and ensure replicated correctly --- --- Update t1 on master -- @@ -299,11 +298,11 @@ FROM t1 WHERE id < 100 ORDER BY id; id b1 vc bc d f total y t u v -2 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL default +2 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL NULL 3 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 7 default -4 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL default +4 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL NULL 20 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 7 explicit -42 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL default +42 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL NULL 50 0 Testing MySQL databases is a cool updated 654321.4321 15.21 0 1965 2006-02-22 NULL explicit --- Remove a record from t1 on master --- DELETE FROM t1 WHERE id = 412; @@ -335,7 +334,7 @@ t1 CREATE TABLE `t1` ( `f` float DEFAULT '0', `total` bigint(20) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id`,`total`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 STOP SLAVE; RESET SLAVE; RESET MASTER; diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt index acd68493e0a..5304fd49b6b 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt @@ -1 +1 @@ ---log-slave-updates=0 +--default-storage-engine=ndbcluster --log-slave-updates=0 diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test index 1be325ed9a1..1657a6902ba 100644 --- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test +++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test @@ -15,5 +15,4 @@ SET storage_engine=ndb; --echo === NDB -> NDB === --echo connection slave; -SET storage_engine=ndb; --source extra/rpl_tests/rpl_ndb_2multi_basic.test