3270 Magnus Blåudd 2011-03-29
ndb
- update .result file for rpl_skip_incident which is a backported test from trunk
- add call to include/rpl_end.inc at end of test
modified:
mysql-test/suite/rpl/r/rpl_skip_incident.result
mysql-test/suite/rpl/t/rpl_skip_incident.test
3269 Magnus Blåudd 2011-03-29
ndb - remove unnecessary DROP TABLE in .test
modified:
mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test
3268 Magnus Blåudd 2011-03-29
ndb
- update .result file since test is affected by bug11932585, add note
- add suppression of binlog warning in servers error log which is
generated by the testcase
modified:
mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test
3267 Magnus Blåudd 2011-03-29
bug#11764737 Optimizer is overly eager to request ordered access.
- Update .result files
- As results are not any longer implicitly ordered even when 'ORDER BY'
is *not* specified the order of rows in these results has changes.
- The rows are now ordered in their 'natural' order as determined
by each storage engine. (Still when 'ORDER BY' is not specifyed)
modified:
mysql-test/r/innodb_mysql_lock2.result
mysql-test/r/partition.result
3266 Magnus Blåudd 2011-03-28
ndb
- Run ndb_binlog suite with binlog-format=ROW by default
modified:
mysql-test/suite/ndb_binlog/my.cnf
=== modified file 'mysql-test/r/innodb_mysql_lock2.result'
--- a/mysql-test/r/innodb_mysql_lock2.result 2010-06-17 13:31:51 +0000
+++ b/mysql-test/r/innodb_mysql_lock2.result 2011-03-29 06:30:02 +0000
@@ -605,11 +605,11 @@ begin;
# Acquire SR metadata lock on t1.
select * from t1;
i
+4
1
+5
2
3
-4
-5
# Switching to connection 'con1'.
# Sending:
alter table t1 rebuild partition p0;
=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result 2011-03-28 13:57:20 +0000
+++ b/mysql-test/r/partition.result 2011-03-29 06:30:02 +0000
@@ -1725,8 +1725,8 @@ insert into t1 values (18446744073709551
(18446744073709551613), (18446744073709551612);
select * from t1;
a
-18446744073709551612
18446744073709551614
+18446744073709551612
18446744073709551613
18446744073709551615
select * from t1 where a = 18446744073709551615;
@@ -1735,8 +1735,8 @@ a
delete from t1 where a = 18446744073709551615;
select * from t1;
a
-18446744073709551612
18446744073709551614
+18446744073709551612
18446744073709551613
drop table t1;
CREATE TABLE t1 (
=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result 2011-03-28 15:05:07 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result 2011-03-29 07:04:55 +0000
@@ -1,4 +1,3 @@
-drop table if exists t1, t2, t3;
CREATE TABLE t1 (m INT, n INT) ENGINE=MYISAM;
CREATE TABLE t2 (b INT, c INT) ENGINE=BLACKHOLE;
CREATE TABLE t3 (e INT, f INT) ENGINE=NDB;
@@ -13,6 +12,8 @@ UPDATE t1, t3 SET m = 2, e = 3 WHERE n =
Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table, and writes to any of them.
UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c;
+NOTE! This testcase is affected by bug11932585
+the above UPDATE is binlogged in own transation
COMMIT;
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
@@ -26,8 +27,10 @@ mysqld-bin.000001 # Query # # BEGIN
mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c
mysqld-bin.000001 # Query # # COMMIT
mysqld-bin.000001 # Query # # BEGIN
+mysqld-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c
+mysqld-bin.000001 # Query # # COMMIT
+mysqld-bin.000001 # Query # # BEGIN
mysqld-bin.000001 # Query # # use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2)
mysqld-bin.000001 # Query # # use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f
-mysqld-bin.000001 # Query # # use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c
mysqld-bin.000001 # Query # # COMMIT
DROP TABLE t1, t2, t3;
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test 2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test 2011-03-29 07:04:55 +0000
@@ -6,11 +6,11 @@
-- source include/have_ndb.inc
-- source include/have_log_bin.inc
---disable_warnings
-drop table if exists t1, t2, t3;
---enable_warnings
+--disable_query_log
+CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
+--enable_query_log
-#
+ #
# Bug #29222 Statement mode replicates both statement and
# rows when writing to an NDB table
#
@@ -27,6 +27,8 @@ START TRANSACTION;
INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2);
UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f;
UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c;
+--echo NOTE! This testcase is affected by bug11932585
+--echo the above UPDATE is binlogged in own transation
COMMIT;
--source include/show_binlog_events.inc
DROP TABLE t1, t2, t3;
=== modified file 'mysql-test/suite/rpl/r/rpl_skip_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_incident.result 2011-03-14 21:34:06 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_incident.result 2011-03-29 08:07:24 +0000
@@ -1,9 +1,5 @@
-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;
+include/master-slave.inc
+[connection master]
**** On Master ****
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1),(2),(3);
@@ -19,10 +15,11 @@ a
2
3
4
-Checking that both slave threads are running.
+include/check_slave_is_running.inc
Should have two binary logs here
show binary logs;
Log_name File_size
master-bin.000001 #
master-bin.000002 #
DROP TABLE t1;
+include/rpl_end.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_skip_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_skip_incident.test 2011-03-14 21:34:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_skip_incident.test 2011-03-29 08:07:24 +0000
@@ -26,3 +26,5 @@ connection master;
show binary logs;
DROP TABLE t1;
--sync_slave_with_master
+
+source include/rpl_end.inc;
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (magnus.blaudd:3266 to 3270) | Magnus Blåudd | 29 Mar |
