From: Bjorn Munch Date: March 30 2011 11:30am Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2990) List-Archive: http://lists.mysql.com/commits/134239 Message-Id: <201103301131.p2UBV0kn029738@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1352721214==" --===============1352721214== 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 2990 Bjorn Munch 2011-03-30 mtr: cleaned up some superfluos global warning suppressions modified: mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/include/mix1.inc mysql-test/include/mtr_warnings.sql mysql-test/r/sp-destruct.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/t/sp-destruct.test === modified file 'mysql-test/extra/rpl_tests/rpl_extra_col_master.test' --- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-02-23 09:31:37 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-03-30 11:30:34 +0000 @@ -123,9 +123,9 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9, #connection slave; 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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"); sync_slave_with_master; --echo === modified file 'mysql-test/include/mix1.inc' --- a/mysql-test/include/mix1.inc 2010-12-08 14:21:03 +0000 +++ b/mysql-test/include/mix1.inc 2011-03-30 11:30:34 +0000 @@ -634,6 +634,10 @@ drop table t1; drop table bug29807; create table bug29807 (a int); drop table bug29807; +--disable_query_log +call mtr.add_suppression("InnoDB: Error: table .test...bug29807. does not exist in the InnoDB internal"); +call mtr.add_suppression("Cannot find or open table test\/bug29807 from"); +--enable_query_log # === modified file 'mysql-test/include/mtr_warnings.sql' --- a/mysql-test/include/mtr_warnings.sql 2011-02-23 09:31:37 +0000 +++ b/mysql-test/include/mtr_warnings.sql 2011-03-30 11:30:34 +0000 @@ -110,7 +110,6 @@ INSERT INTO global_suppressions VALUES ("Sort aborted"), ("Time-out in NDB"), ("Warning:\s+One can only use the --user.*root"), - ("Warning:\s+Setting lower_case_table_names=2"), ("Warning:\s+Table:.* on (delete|rename)"), ("You have an error in your SQL syntax"), ("deprecated"), @@ -133,34 +132,17 @@ INSERT INTO global_suppressions VALUES ("Statement may not be safe to log in statement format"), - /* test case for Bug#bug29807 copies a stray frm into database */ - ("InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal"), - ("Cannot find or open table test\/bug29807 from"), - /* innodb foreign key tests that fail in ALTER or RENAME produce this */ ("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"), ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"), ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"), - /* Test case for Bug#14233 produces the following warnings: */ - ("Stored routine 'test'.'bug14233_1': invalid value in column mysql.proc"), - ("Stored routine 'test'.'bug14233_2': invalid value in column mysql.proc"), - ("Stored routine 'test'.'bug14233_3': invalid value in column mysql.proc"), - /* BUG#32080 - Excessive warnings on Solaris: setrlimit could not change the size of core files */ ("setrlimit could not change the size of core files to 'infinity'"), - /* - rpl_extrColmaster_*.test, the slave thread produces warnings - when it get updates to a table that has more columns on the - master - */ - ("Slave: Unknown column 'c7' in 't15' Error_code: 1054"), - ("Slave: Can't DROP 'c7'.* 1091"), - ("Slave: Key column 'c6'.* 1072"), ("The slave I.O thread stops because a fatal error is encountered when it try to get the value of SERVER_ID variable from master."), (".SELECT UNIX_TIMESTAMP... failed on master, do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS"), @@ -171,7 +153,7 @@ INSERT INTO global_suppressions VALUES - Question marks are not valid file name parts on Windows. Ignore this error message. */ - ("Can't find file: '.\\\\test\\\\\\?{8}.frm'"), + ("Can.t find file: '.\\\\test\\\\\\?{8}.frm'"), ("Slave: Unknown table 't1' Error_code: 1051"), /* Messages from valgrind */ @@ -189,15 +171,6 @@ INSERT INTO global_suppressions VALUES ("==[0-9]*== Warning: invalid file descriptor -1 in syscall write()"), ("==[0-9]*== Warning: invalid file descriptor -1 in syscall read()"), - /* - Transient network failures that cause warnings on reconnect. - BUG#47743 and BUG#47983. - */ - ("Slave I/O: Get master SERVER_ID failed with error:.*"), - ("Slave I/O: Get master clock failed with error:.*"), - ("Slave I/O: Get master COLLATION_SERVER failed with error:.*"), - ("Slave I/O: Get master TIME_ZONE failed with error:.*"), - ("THE_LAST_SUPPRESSION")|| === modified file 'mysql-test/r/sp-destruct.result' --- a/mysql-test/r/sp-destruct.result 2009-11-21 11:18:21 +0000 +++ b/mysql-test/r/sp-destruct.result 2011-03-30 11:30:34 +0000 @@ -1,4 +1,5 @@ call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted"); +call mtr.add_suppression("Stored routine .test...bug14233_[123].: invalid value in column mysql.proc"); use test; drop procedure if exists bug14233; drop function if exists bug14233; === 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-02-23 09:31:37 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-03-30 11:30:34 +0000 @@ -59,9 +59,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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 * @@ -934,9 +934,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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 * @@ -1809,9 +1809,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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-02-23 09:31:37 +0000 +++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-03-30 11:30:34 +0000 @@ -59,9 +59,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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 * @@ -934,9 +934,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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 * @@ -1809,9 +1809,9 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex( 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 SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091"); -call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054"); -call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072"); +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/t/sp-destruct.test' --- a/mysql-test/t/sp-destruct.test 2009-11-21 11:18:21 +0000 +++ b/mysql-test/t/sp-destruct.test 2011-03-30 11:30:34 +0000 @@ -14,6 +14,7 @@ # Supress warnings written to the log file call mtr.add_suppression("Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted"); +call mtr.add_suppression("Stored routine .test...bug14233_[123].: invalid value in column mysql.proc"); # Backup proc table let $MYSQLD_DATADIR= `select @@datadir`; --===============1352721214== 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: 42e2701cc991767bb28dd2f3434681e7131f1c0e # timestamp: 2011-03-30 13:31:00 +0200 # base_revision_id: bjorn.munch@stripped\ # 1co3i4c64tooueyg # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUhguloABqBfgFAQUPf//94q 2g6////6YAt99L51oigBQKB2ZKVUUoqiVBmMpFERtTamjR6m0mjTTamhkGjEwTRiAAOYExNBhMmT JkYTBNNMjEwBDAcwJiaDCZMmTIwmCaaZGJgCGASJRMUeKeiNNDT1GgAAADINAAIpEamRkCnlP1PR BkTTap5Jp6CZADTRp5QSSEyMgTE0TJiZDQhPUm1A0AABnHGPPbwGhbhG7rIOyCEzy6/D09ft/i1q 7LKYJaoC51iuuzg2qCxm8nHVlFhFukknCVpARKsKHVpQdc09M81BKMlHcl2ouZRLoSaWNYksaVID G2wbSY2wJfNBJ8MoppQiSx1ssuw5YJtGFeGaMPHFtITlBKqTnVSscVMrGID7IwdAe97RIE3vIP4v W/1omvTtWres0KLyAgCa9WRZn81afrkXJkMgHjlPog5jctvG2JqyPrl6rbAJ0F0LMYSLLiXv5LDi ucRiaDKHQADt4ROhaBlUCGzdcP3KXeMYhADbVrWxfgLm8RGQrTxMUGObeI9Yid/eagud4pnwSMR4 JbDxPPhYXjz8njbRBb2M3f4MSYOOC9/dMeEBcaLPBYXgt62LCJsL3a6eP9lq8bkHEyPQibS5R89U 1pAjnM+/1SNTWrlW6pyExKtty+/sW/dkUdkK7YKo6d5ABiQi0JCDdIdwMxzwGGBKI4QXHMsPQ8Sg TLEqjh70iXESZMgJ6VtQpECWJVE7khyUQgFSB6eWF5MfCQ8QZBxEECxsxGAwULr0nMigeVfbf4ZQ 2BYskSiwQsyF3GGeszWqLiskXDnQEGpuH0nTImVjFR/kluGKoVQttry26yyYQfMtQddmDhxMt3iZ BBDrvksUyquJi72zmdEoGZsxJw8MhxcNvMnvR7Bns5QQ4brmVScNgNsS0tNbVtSeeNbxKsiSIBWO tqd4B4A0IEIJSIUAKyDhCuHS24k5igQcjDUnSyYmstUgdMsBxMeOsm/UvNhEsCorNw4vuF4GkBEz IsJmJsPtuNgw8rOpcVnYxLBBAsNNdcwNMml0yiVleQgrfMcIH+MQfIN+YZx8akXjCCSMywePGEEM aBYXEJDPN1WDNYDFhMMHkAvCkHnQtLDDDcZ4kyJGNlhUc/nmfpXI6NtPoehj/zmNdq3+jUZIKpki DBotShPcVoYpSS1wbKzE/4ocoqQMUGKxis8Mbbua5DO8zniVE2GfKUiFoDSA8zoeKoVGJHQmTuHk rrTqdyS3fkbpyrm/aXYIHA8vYhI6mfQIk9zTWRq4tGZK0mlv9TOo1IHpXtIlpZXc8plkMZay2Ghc RMh1V5iUs6lq1rzyg964JOKGwkMF5EedSyXYuqJjCbChB6gubSOthTdkgwxGyK93pebsS13Dd8Gp Q6jjE5l5i2SlF+GiYQTwF1yAkZyqAmvGLCBxPIzZL5aLipcmN5UicnoO7EiqBqbChaUKzCYMUeXH gfU1HFp0MjZO2JsMiJA0ORUEA1PzH11EjyHFFPJ152vIg+ofuIXlqiaO3sUKgx6SLihYZH/p1FzU ZDDdi1A59V/oaCiXDBALis8zzKbTSwlMuNKmiXlCBtKzI2B1EFYkXO+o112SWLgL373DoW0dFzgI 1PQNFqgJCISi33QKaWn3A20waabT5UtSJEoEtXIlsZObnELNMuYVNiaGxx9Ov9FuPuNS2QqTqWX2 X7LatapWvmfMvgPTL1BwVOx7WqBmbproWCchPeSK2ORUTK/fhUWQAPFAmjWvW0Ze1iD3GS9SY4qO vqQL5XlAoRPm0vQZWfetJJ2w0QKlMwmRkImfJVSh2PvagyLbSi2/4BO6hP5nMbLkDSfEOQmKwSwz liJtIPw+E/abD5YnuMsHTI8Swmazv9xwoXHUfI4ngfgl+R9AGSd/fwL0j2O5qRoYHA5lG/ISXLvH U4mBidAhpKQTcShyLl5yVrMXoOksO02WGU1IN50kHPaegF5eK77lnJRnUbSw1vsEaBRSMkJY7D1L xcAlz+Dww2My2D8Et5t46noY8SzAwL0PiZUN5IoVbyStqDWbTc6ye4ORFyDgVEUIf5RGY1Np4DwI 1VMQO54gREGEthpJlvOUtZC96JAgbDQX80ydxuMDtwkUPTbG87JD/MaJgcyRMvMKkI90skqyjB9W HRSoIYgZG1+wcl69jfE5HQM9225nwJZ5Ywbp/Zxz8sAOSZBgXm3fa5BXzy3kIQPz8vJkvG4QpCB1 BOejAQQJznFWpXuE+y5lwL3SXbheJicxpOc5jsDqdE8596FpQ4vJFQ8eMeZUfbvACsrvLDkB1Psl 7peIjudLGO8C64+j7iHufbQNvqT5hE8nH7zUsOB4mrcpLPj95Xrx5aW4mWmvuMTpIUdABImtpmYj 8ZJfUmeRld8FpeQPY6CD4JE+4gvNxWvbebrzbyLUk7An0A6iQ4OIg6yIHARUZ2hVMs0J/1Y9ONkj 2kcTmCC8o95wEfKS8zqszeOmSXm9R2SEOB2HjIR6jQZzq6j1AdMQHHgvt6ziJaYnZLxlpqaIFpJm MBgxDOQiOJxqtGXygsUOJ5IlZsO0M5r8FgDBRkrIlrOJW0EIQLt5Xh7nvwNDQilvS1vKE0kdq22m RbxIwuHAlX6DnvKDmGqUIJethtKGJobdx9qGZbokj6l94G05/CBPncWHkIXesvNLBiSWIloBs5JO JnCQFwjrKloI6l4rFeBAFldywW25IEZAEqSTNWHmu8oXm48ixq1JdE+dd5Iv0ASZMyBkvQb4NCXP cqgkTL8iY9RQiuFoES84FAArhFwj1lygRFVbqlECnkozBz6jSvlIXvUuGRQ2+bK0gBVLE1ZCHWBk Y5HVyTIKiISAkIKWNQFF/j9hyQniF1JviMMbDoTzNv4nb0Ngl9T2Y9zuW003vfBMgVoTOgeh1EFV gkRAck5ITAwhjZYPJoDUQtUa/HECfIatsXGA83PWYyQn2itMI1v3iRQ914iqXM1zIJFVdQmoTcAY VeIm2cFsXaIJ8G8XCErHYlQgU4h4iRLgrAtdSV++g7W222223UFq9qlFG8CFDchoEks1vNJNO4uo VoMslqwsLhEa0OhiCAptk7hou06iw7eszdpa5Vh4iw50OklPYSxgCmdDJ/OtdcxZYEgL9PW82mJL aGh3K+BuWQj8TNfqDiIJ/B6IS4CI1iWTkHDA02HcpyLSh2oLwDnUbVaGJiWslJJEHnUIz31IunvI LTC6WwyGJREm+BlvPZWcwlp+DHmfBecS/sqXkqjAztNiTiCqMenYqLF0EF80lQ7kzUggVDIQM4S4 uvHDyBc8erDmfQ0aCFJl3A4GJCu0MhmzE7imJoWyNOksy+fy/8XckU4UJBIYLpaA --===============1352721214==--