Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-07-26 16:44:57+02:00, mats@stripped +4 -0
BUG#29809 (Slave SQL errors in warnings file):
Adding code to filter out slave SQL errors since these are checked by
the tests themselves.
mysql-test/lib/mtr_report.pl@stripped, 2007-07-26 16:44:51+02:00, mats@stripped +1 -0
Filtering out slave SQL errors since these are handled by the
tests themselves.
mysql-test/suite/rpl/t/disabled.def@stripped, 2007-07-26 16:44:51+02:00, mats@stripped +0 -15
Enabling disabled tests.
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result@stripped, 2007-07-26 16:44:51+02:00, mats@stripped +22 -26
Result change.
mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2007-07-26 16:44:52+02:00, mats@stripped +0 -2
Enabling disabled tests.
diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl 2007-07-16 12:09:43 +02:00
+++ b/mysql-test/lib/mtr_report.pl 2007-07-26 16:44:51 +02:00
@@ -330,6 +330,7 @@ sub mtr_report_stats ($) {
/Slave: The incident LOST_EVENTS occured on the master/ or
/Slave: Unknown error.* 1105/ or
/Slave: Can't drop database.* database doesn't exist/ or
+ /Slave SQL:.*(?:Error_code: \d+|Query:.*)/ or
/Sort aborted/ or
/Time-out in NDB/ or
/Warning:\s+One can only use the --user.*root/ or
diff -Nrup a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
--- a/mysql-test/suite/rpl/t/disabled.def 2007-07-16 16:12:01 +02:00
+++ b/mysql-test/suite/rpl/t/disabled.def 2007-07-26 16:44:51 +02:00
@@ -15,18 +15,3 @@ rpl_innodb_mixed_ddl : Bug #29363 rp
rpl_innodb_mixed_dml : Bug #29363 rpl.rpl_innodb_mixed_* test failures
rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case
rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
-rpl_deadlock_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_extraCol_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_extraCol_myisam : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_incident : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_known_bugs_detection : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_loaddata : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_loaddata_fatal : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_rewrt_db : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_rotate_logs : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_row_inexist_tbl : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_row_tabledefs_2myisam : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_row_tabledefs_3innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_ssl : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_stm_EE_err2 : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_stm_mystery22 : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result 2007-07-25 15:35:06 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result 2007-07-26 16:44:51 +02:00
@@ -35,11 +35,10 @@ master-bin.000001 223 Query 1 287 BEGIN
master-bin.000001 287 Table_map 1 327 table_id: # (test.t1)
master-bin.000001 327 Table_map 1 385 table_id: # (mysql.ndb_apply_status)
master-bin.000001 385 Write_rows 1 444 table_id: #
-master-bin.000001 444 Write_rows 1 482 table_id: #
-master-bin.000001 482 Write_rows 1 520 table_id: # flags: STMT_END_F
-master-bin.000001 520 Query 1 585 COMMIT
-master-bin.000001 585 Query 1 665 use `test`; TRUNCATE TABLE t1
-master-bin.000001 665 Query 1 741 use `test`; DROP TABLE t1
+master-bin.000001 444 Write_rows 1 491 table_id: # flags: STMT_END_F
+master-bin.000001 491 Query 1 556 COMMIT
+master-bin.000001 556 Query 1 636 use `test`; TRUNCATE TABLE t1
+master-bin.000001 636 Query 1 712 use `test`; DROP TABLE t1
**** On Master ****
CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
INSERT INTO t1 VALUES (1,1), (2,2);
@@ -72,24 +71,21 @@ master-bin.000001 223 Query 1 287 BEGIN
master-bin.000001 287 Table_map 1 327 table_id: # (test.t1)
master-bin.000001 327 Table_map 1 385 table_id: # (mysql.ndb_apply_status)
master-bin.000001 385 Write_rows 1 444 table_id: #
-master-bin.000001 444 Write_rows 1 482 table_id: #
-master-bin.000001 482 Write_rows 1 520 table_id: # flags: STMT_END_F
-master-bin.000001 520 Query 1 585 COMMIT
-master-bin.000001 585 Query 1 665 use `test`; TRUNCATE TABLE t1
-master-bin.000001 665 Query 1 741 use `test`; DROP TABLE t1
-master-bin.000001 741 Query 1 858 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001 858 Query 1 922 BEGIN
-master-bin.000001 922 Table_map 1 962 table_id: # (test.t1)
-master-bin.000001 962 Table_map 1 1020 table_id: # (mysql.ndb_apply_status)
-master-bin.000001 1020 Write_rows 1 1079 table_id: #
-master-bin.000001 1079 Write_rows 1 1117 table_id: #
-master-bin.000001 1117 Write_rows 1 1155 table_id: # flags: STMT_END_F
-master-bin.000001 1155 Query 1 1220 COMMIT
-master-bin.000001 1220 Query 1 1284 BEGIN
-master-bin.000001 1284 Table_map 1 1324 table_id: # (test.t1)
-master-bin.000001 1324 Table_map 1 1382 table_id: # (mysql.ndb_apply_status)
-master-bin.000001 1382 Write_rows 1 1441 table_id: #
-master-bin.000001 1441 Delete_rows 1 1475 table_id: #
-master-bin.000001 1475 Delete_rows 1 1509 table_id: # flags: STMT_END_F
-master-bin.000001 1509 Query 1 1574 COMMIT
-master-bin.000001 1574 Query 1 1650 use `test`; DROP TABLE t1
+master-bin.000001 444 Write_rows 1 491 table_id: # flags: STMT_END_F
+master-bin.000001 491 Query 1 556 COMMIT
+master-bin.000001 556 Query 1 636 use `test`; TRUNCATE TABLE t1
+master-bin.000001 636 Query 1 712 use `test`; DROP TABLE t1
+master-bin.000001 712 Query 1 829 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001 829 Query 1 893 BEGIN
+master-bin.000001 893 Table_map 1 933 table_id: # (test.t1)
+master-bin.000001 933 Table_map 1 991 table_id: # (mysql.ndb_apply_status)
+master-bin.000001 991 Write_rows 1 1050 table_id: #
+master-bin.000001 1050 Write_rows 1 1097 table_id: # flags: STMT_END_F
+master-bin.000001 1097 Query 1 1162 COMMIT
+master-bin.000001 1162 Query 1 1226 BEGIN
+master-bin.000001 1226 Table_map 1 1266 table_id: # (test.t1)
+master-bin.000001 1266 Table_map 1 1324 table_id: # (mysql.ndb_apply_status)
+master-bin.000001 1324 Write_rows 1 1383 table_id: #
+master-bin.000001 1383 Delete_rows 1 1422 table_id: # flags: STMT_END_F
+master-bin.000001 1422 Query 1 1487 COMMIT
+master-bin.000001 1487 Query 1 1563 use `test`; DROP TABLE t1
diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def 2007-07-17 19:33:22 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2007-07-26 16:44:52 +02:00
@@ -25,5 +25,3 @@ rpl_ndb_ctype_ucs2_def : BUG#27404 uti
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
-rpl_ndb_extraCol : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
-rpl_truncate_7ndb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
