From: Bjorn Munch Date: March 31 2011 8:33am Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2991) List-Archive: http://lists.mysql.com/commits/134339 Message-Id: <201103310833.p2V8XEUG014394@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1235967461==" --===============1235967461== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/supp-51/ based on revid:bjorn.munch@stripped 2991 Bjorn Munch 2011-03-31 Small followup fix after MTR warning cleanup modified: mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result === modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test' --- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-03-30 12:33:53 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-03-31 08:33:07 +0000 @@ -122,10 +122,13 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9, #connection slave; +--disable_query_log call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); +call mtr.add_suppression("Slave I/O: Get master clock failed with error:.* Error_code: 2013"); +--enable_query_log sync_slave_with_master; --echo === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-03-30 12:33:53 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-03-31 08:33:07 +0000 @@ -58,10 +58,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * @@ -933,10 +929,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * @@ -1808,10 +1800,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-03-30 12:33:53 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-03-31 08:33:07 +0000 @@ -58,10 +58,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * @@ -933,10 +929,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * @@ -1808,10 +1800,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456 -call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"); -call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"); -call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054"); -call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"); * Select count and 20 rows from Slave * --===============1235967461== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/supp-51/ # testament_sha1: 37e8c104d87fab89d0a1b2581dcd27e5c9521a38 # timestamp: 2011-03-31 10:33:14 +0200 # base_revision_id: bjorn.munch@stripped\ # hqpxmewuu1qa4nbw # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbIbR/oAAp1fgAAQUHP//1Ki nAC////wUAW5F50Bbq4BEB3YhJQjSeoxKe0aNqU9k01TI/Qk2mo9R6AElKTJvETU/U2lNiNIyMmI ZGEwEEiImoahk0nmlMNBGmAmRtGgDAAAAAaAAAAABJIRkAJiaNEyZDTQp6nqaAD1Mucw7Bn+ps2f M/g4OHRjk0n5z1yiqPAcEwJq7VNpvrSt3Au1Y020MaNnkttLmXvcggqa9d9IGVGWc2gcNGWDTruh 6Rz/G503Z67/91vbXJYoMQuktWll74QTOzNVqsYcOKTfFqFs8d9X6wO5gOGgGoqI8BGOwZoFTrsV vr3FGBhcfejPegKEBbpkiuss8ytRKIGDN17cEpGAQaBTMcZloJFuUZQqIqLMLIREQYihkwxIndSo gynXYYOXczoFIAmEUGZvuOUAD9ITXwAtCTqb6SeFcY4BsRWHKuWwjhPWQIurtEiiXrynwX/PVHxE 9dBTUseFA1plFQwAngRFbPmKioBhoG8dybGsWTxWFu8kVnAkcSu6m8UROYRtwH1hARrY55FMKgQw jWkWITiolvQZ4umL6bR5aQt4evc1tL7WccjXYPRAfq8OVpIYyWv3EkSpvSdEOI/exRITs7Z3aG0V 0w7MUKZzY8scbCO0IF5YUTEWUJOCsJ9AhNBFM8w1c6NmQyhuPc2jiJXMNQItYTBRzeL6IY5EDZTc jhk8Y+ykrOsTYPLNLKFzNBw/XiPwEUZva6F19qW5CSawbKUGcRlEVExSTjReQWRsJ4QvkLhm+chA aB7eTerYM0AadNKYOuqApCHc6BYUj5mdNXIOWWlMNqrcmCr/i5c0BKQTAYf6Lp0Te0K+2C1rjW+x SZpV6li7yCqckHRmkxWAz3dHEWA333nUTolIcc+ibnKhEP3VcbYPFkyHO6l7ydVtzeZpSg+KUJtO /vqZHuOvGDtYdzies8T2+RHkLsegMnfzmfBeQuMTUXuJVkDxKGvMTyaOaiVnCYyK0g5/NjmQHUeU H+igHmgMbDlWXq/yeZiKi1xiXoiiA7wclVfpfZtOLGnQmpleaELj1IhyV0vvFJHsWaTm3DwPxMES 020HcHey9U/NvZh1yqExAydSby2o0moHk23ssGfYcaZQbD+nH2I1+A1TI5meaw0cg6emXY/bnxrk Dmcf8wtSAoJdxHQrIaC8RvMwPE3E3mRPWRoUZuKDmHUyD2XdRUBurKqy8d6HniTOHpY4mBm2sSCw C4nwOhDwFUi4ylt5ofUPSbiTVhFBqcGzQKjNl7x0y36StKluwXgR4Ko1jMCC/HERERiI9HIC0kN5 tZRuLBZR5cGScUkCGoy7oIpl91DxHM81agGFcOdmQXCfRg7EdhfwJz0T6iYkAUtb1hAnHMNwT1zl +BNgYZlhZKQXln0gPV5It7Ky6oZANabhDgapewsrmQEhTsUUeZvMya2tJzIpcuQ3ViBPAnwpgSPo RyJkdRFThIqS+aA+0BEXoRUhB1gsbMoeHkgduuPByZDyYJ5WgoP3dhw+PMU5afIt9q6HiJjzOhlO cHPGeGZyMR4EAcgGBhMdIoMOpPnqB0r0kNf4OiblUK2qx38x4MTqxDMlLLcPcZI1errhQrI6t1eb bb7lelnEZBRiGQRM5NR/KS5cBOTWHV5awG+Sp3CdGnLT6Li/gZlgsF0NcRD4UuRZIsxPLUVRvYpJ mP3sQHOuC7iHiqgomouhwLzfM/AUCFcRh5ueJzyheIEiZAa5tEcSM6TpMYWpUy2CPsXckU4UJCyG 0f6A --===============1235967461==--