From ae5ff26d853066b3196f1bbe941edd5a6c5799ce Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Nov 2007 17:28:55 +0100 Subject: [PATCH 1/2] Bug#8693 Test 'rpl_log_pos' fails sometimes Disabled the test case. --- mysql-test/t/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 018e8ad520b..0f736265209 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -20,3 +20,4 @@ grant_cache : Bug#32651: grant_cache.test fails rpl_log : Bug#32653: rpl_log.test fails randomly rpl_view : Bug#32654: rpl_view.test fails randomly ndb_backup_print : Bug#32357: ndb_backup_print test fails sometimes in pushbuild +rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes From 1a73853c04c907ec72e4e333b609d6d5b1068fe8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Nov 2007 21:30:00 +0400 Subject: [PATCH 2/2] after-merge fixup: archive test/result adjusted. --- mysql-test/r/archive.result | 2 +- mysql-test/t/archive.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index a0b13b14b17..0fc43f58908 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -2618,7 +2618,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -OPTIMIZE TABLE t2 EXTENDED; +OPTIMIZE TABLE t2; Table Op Msg_type Msg_text test.t2 optimize status OK SELECT * FROM t2; diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index 2d29cab041d..14a124a96bc 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1317,7 +1317,7 @@ SELECT * FROM t2; INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -OPTIMIZE TABLE t2 EXTENDED; +OPTIMIZE TABLE t2; SELECT * FROM t2; REPAIR TABLE t2; SELECT * FROM t2;