From: Andrei Elkin Date: June 19 2011 10:39pm Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3310) WL#5569 List-Archive: http://lists.mysql.com/commits/139481 Message-Id: <201106192239.p5JMduGI009740@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0900291723==" --===============0900291723== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped 3310 Andrei Elkin 2011-06-20 wl#5569 MTS fixing tests. Adding suppressions to few tests that produce sql thread error. Experimenting with rpl_relayrotate to descrease number of rotations and thus to make it clear if timeout is not due to computational load. modified: mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_relayrotate.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_row_colSize.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/t/rpl_row_colSize.test === modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_slave.test' --- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test 2011-04-27 09:04:59 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test 2011-06-19 22:39:48 +0000 @@ -15,6 +15,7 @@ call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); --echo **** Diff Table Def Start **** === modified file 'mysql-test/extra/rpl_tests/rpl_relayrotate.test' --- a/mysql-test/extra/rpl_tests/rpl_relayrotate.test 2011-06-19 13:11:25 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_relayrotate.test 2011-06-19 22:39:48 +0000 @@ -18,7 +18,7 @@ connection master; --disable_warnings eval create table t1 (a int) engine=$engine_type; --enable_warnings -let $loop_max= 4000; +let $loop_max= 2000; let $1=$loop_max; disable_query_log; begin; === modified file 'mysql-test/extra/rpl_tests/rpl_row_tabledefs.test' --- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-02-23 20:01:27 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-06-19 22:39:48 +0000 @@ -149,6 +149,8 @@ INSERT INTO t4 VALUES (4); connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); + --let $slave_skip_counter= 2 --let $slave_sql_errno= 1677 --let $show_slave_sql_error= 1 === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result 2011-02-23 20:01:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result 2011-06-19 22:39:48 +0000 @@ -2,6 +2,7 @@ include/master-slave.inc [connection master] call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); **** Diff Table Def Start **** *** On Slave *** STOP SLAVE; === modified file 'mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result' --- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result 2011-02-23 20:01:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result 2011-06-19 22:39:48 +0000 @@ -2,6 +2,7 @@ include/master-slave.inc [connection master] call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); **** Diff Table Def Start **** *** On Slave *** STOP SLAVE; === modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result' --- a/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-02-23 20:01:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-19 22:39:48 +0000 @@ -267,6 +267,7 @@ RESET MASTER; START SLAVE; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* Error_code: 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); *** Cleanup *** DROP TABLE IF EXISTS t1; include/rpl_end.inc === modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result' --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-02-23 20:01:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-19 22:39:48 +0000 @@ -119,6 +119,7 @@ INSERT INTO t9 VALUES (4); INSERT INTO t4 VALUES (4); call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); include/wait_for_slave_sql_error_and_skip.inc [errno=1677] Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'' INSERT INTO t9 VALUES (5); === modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result' --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-02-23 20:01:27 +0000 +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-19 22:39:48 +0000 @@ -119,6 +119,7 @@ INSERT INTO t9 VALUES (4); INSERT INTO t4 VALUES (4); call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535"); call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); include/wait_for_slave_sql_error_and_skip.inc [errno=1677] Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'' INSERT INTO t9 VALUES (5); === modified file 'mysql-test/suite/rpl/t/rpl_row_colSize.test' --- a/mysql-test/suite/rpl/t/rpl_row_colSize.test 2011-02-23 11:54:58 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test 2011-06-19 22:39:48 +0000 @@ -163,6 +163,7 @@ source include/test_fieldsize.inc; connection slave; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* Error_code: 1535"); call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677"); +call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state"); --echo *** Cleanup *** connection master; --===============0900291723== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/andrei.elkin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@stripped # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\ # mr-wl5569/ # testament_sha1: 556e3f19b22f803d806e67c8b9c39288be95435a # timestamp: 2011-06-20 01:39:56 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # ze0hd9suh3dhrmol # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXWmBKQABkVfgAAQXGf//3IC DAC////wYAv8H1Cl2GXTKg6YQAKAAAA+2oABlIQyaaNPRDTZQZDRgmjQ00AyVPUwTwmpk9QAAAAA AMBoAABoAAAAAAkRJppAaDSp+CKeU09I0eofqn6o9E9T0GUiNqD0RkNNqaaGmmRoZBkwgFSkCYTQ JiaaZBqYmQhTynqaYOGRpyyiNxyqXsUJdvXh3+In6e3uU+ek65+oQ4fShCZU5bNghWqlAKCboRMx Tx8bpIy4XnC6zthGE/aeSD1QWQNjG22222NB7dxKtKsGY6ZJZrZrvUejuZV6GGNsJkrBDIboYkVp e7nN+OnPttw+wDAx69gO4ET0iiD/fi13cDSBa+oH1woOcNNuKuHyL6kf/f4uhYKDX2pchhjmA15r FxfQDw/Dn16R0ujmX4en50fpuQT9eKbHnyQY1c7M+7X527x6yGP5FUQ5fXkKX+I1jcxOyp2P9Kn+ UHnHRvSji1Xeyxqrzhs9eOiYvKXpHJDnm1e7OuaLNjxWYWC3hINnCRO6SxZL2DcslknfC7VXDnD1 37dEDuom2lKFvHV6rIuoWS59oEGDMuMCAkVczDA8YSvGLOVM66zC2pRmuTFML1TTpvsXNNEyRNDG 1reC489FppV1V4yMKpdqVqlMWKxyUYLtGkwaJuJHTcLAtCWGgzaqKSHtHOuHoLhm2DbsDABFytbF KluJiBQkFwUIo5w0TgtBjC5iZUhE18KtiFN2nVsS6R/aN0+X+t95a1t2KtKTaWy9qqaW1e12eljB dreXCbUTkyWyL1RwXq3dCtqXOViGqcpL9+buWrE/lDSogtTFvfipjrMGuvuWqNNzBKJVJWkZuEZv losoSb75a0r1igp36HYtrILMY3lYFBnGZHSAvNZqoYHge/kih5Hy/W/Pu3Gul1Z57MRlcRZiNBng XjxKhmFD/bm4MPCp32NxkkWu9i7KpkpPpk9p4smdHuKByMh2lXArGAb0nRFGGUBCsQWCgNMEjSEg STNE+d2NahS9SUOeVnTnMjo1PjmbGDC0TSoxWMma2uSmKNTNmye8VLGbW8nk67Wha8nTJ3cTSY2N m0ZXf58kairLEkkirCxNnAvyvFrJIauGc0t5TA706DDPg0YlmUkw1FB5pM04dKE2Ne3QyVtTGNhz a2OnBra2uy5dPNimDewY1ZwQbMZLxpSmIUb+hnC4NZBUk+RWJ6m6TIzWN+bOjo4V7ddVEdlTNtUb nc6MVjZpXcXs+Hr1jc2x8JHw+7dmZZpWpyp3VOTaWWrvB0WYL1jzW1tGLxWK/HzrXqNvSRkzVK48 OKtzXaWxuYua9e/5FGT4ut725xy4ZWUmrKleCRuvtd9zg4Wlt6p1XLHJxvx1Oa26tqY3tSyjDPi0 38VTwmWqy8ShQWHicK1g5wWUhzUREFRBCmiiQOEgYGXlJqb2xWkXtFalF61qZ6GiakixRdva83rk qcGhozVsN7g1rWyxerXUeKRfPVNTDOoY3olLZsuzVdz1sRQhIdXQRYFW9vsi5rd2EasDx2BDGNtt nkg2SgYg5eyD1/ZKlUhZurVmJpDPeNK+OZ8aQPMKn8HmmFVtTFphBcgkaF84IaC/GElIrKoglMWI EYIGpHn5eFVWEjBSHi6OT2aXmtdWCprXrXze81q9eseqWL2S/s2w4aJIbP70P4FcO5qbmt34E9Pp uVc9UfXyLyyG3D0h9j2eiKQq/1/T7v3ceuA2RFeTb604jWSqjYPaewXi2o/OqdsD0ePZ9lvnk6v3 fp62Phk0KNC17MFHg5W2NLIuXsPFqj4rWP4UnHe3vOT42w9xzXpbrjufpEwcGx9OKtVycGTivo5U Yi7vpTi6jdO9vqxVSD1739FZSTlIO+3AUGiOT+HzVKPDc7ad2MK99Y4wtqcMLfGjJ4vTmteLv7Rm zdGyRqkZur3UaMlJy0WOr2mch4QxbXMfk8D8cnjHrwHg/5pVObpC3Tl4OrunsmaPkafv7ujmSZjl 3LnFs736HpD+fDoPHaMuEiovSA3qcIgZKDcYkrbTC4kx5HL6HMyDB6masX9N7o9mpk2Q/ENXqjfV pa4U3EpYm9t40F1KDSzWvPVx8huXw9ft842U58HZW8Icny3Enbi9Hzz0U8//6l5skTxFSPLGVSKv lzeUpmNndh9uftSdzRNH205wwgqpFUnh2VEpfZIfgmmNHxho6oclXiz6urxeSrxXq1bs73ouavs0 uSpqR7uehuRpftD8wthsVfTnY/NryxhpWcH6ap+GpySPLORudn0/NTxiXzW6N6pZ1ZtbPLw0z2Vj 1It6T+RxvXLz0+7NuljGFcpROsG21QksbHp77BTq8Pz8SFNtiYeupHpImFkstoKSJaKhUTXtFnK7 Jtp/j7d+HvNxF6ntudWz6NhLhX4J+vr7uPe93VmrrjF/lSR+a+tKez0YNzs1Oy26Ti+nByb2C2el qjKpvF088n7puJPQnRY+z6a8k7mp3teQ3a6e7ibZvXyXUjuc2HCL+UVqpi3QoUEpKHfhE2rTXH5h qkFIXqQq8xfCz1u/u+RKhX6zR/v14sC2KobKPJNItQYlPbHjPPG6G1dR4+zyY4TRoRXr0vzmP4k+ O02P2pjhDYjKGclNMVJFUK5EoyhUM9slQqhQn81SJb+mFpKXveKz0Mfi9HRItpIs4VzyVN8Vyp7v b2PLSamOvy0yOspCNMR96KhhQX7KX5BV/yQVEsH3Gqecn3tlBsvjR3uFck+mlr2/MiYzrrclNPHu jyqhSRZrUvjFFB+1+beq6OXc7ohfmL59RePRHC6F2za82zi1s2LUucW9XPsrWqQ5tXNe4cXTeLMq UHaNtl4sm5USuQUKE8alQ0D2d+2Gj8EmRdEayAknXOsEOJRqbACwgtlBMIJEYU7jY2cwFYCT8VhQ iZkYwGMchwNRnYfl4cjsJFyuXSvEO7bXvtrKukdnZKiz0vMeynJ16faKI7+MMAMATxA3hRBqNIja +IFNAzig9m22226UpSlKdy3mjd3ikOiiFg2DYqG4lkn9TSlUV1CzFI8G128F+3Tq518RrnGKT1UV 6deLy/WGiaIaEKkrGiFWVBSZU8C2GSk0ZpoHhaNUO7KUkKu/RXIwy9K+LXa0r57RcViwUJbMW4eq bCWWxlVIzsiL5Tq9pY0Ppe3r+yq66fDzVq0zeNUatclSLXBX72133JGtzSKmTBrUa4VULGEqR0Jo d7UzS5+o3Knoau9OrKkhkkYvfa7pJXL1F0rU56XCdOdg2OF3x6shNC5zb4+EjlxVz7Oja4On77Vr 9OYK5I8RdFT8Mng6NjmfpuKkcNsta3VpmT02Rnly8U2pnKQzU5OOLHb8pxdnu/6LuSKcKEg60wJS AA== --===============0900291723==--