#At lp:maria based on revid:monty@askmonty.org-20100805155944-7fdst1ypsqq2gx92 2882 Michael Widenius 2010-08-06 Fixed test case and compiler warnings modified: mysql-test/suite/innodb_plugin/t/innodb-timeout.test support-files/compiler_warnings.supp per-file messages: mysql-test/suite/innodb_plugin/t/innodb-timeout.test More time for test case support-files/compiler_warnings.supp Ignore compiler warning === modified file 'mysql-test/suite/innodb_plugin/t/innodb-timeout.test' --- a/mysql-test/suite/innodb_plugin/t/innodb-timeout.test 2010-04-09 12:56:51 +0000 +++ b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test 2010-08-06 06:36:09 +0000 @@ -48,7 +48,7 @@ connection b; select * from t1 for update; connection a; -sleep 2; +sleep 3; commit; connection b; === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2010-08-04 18:36:11 +0000 +++ b/support-files/compiler_warnings.supp 2010-08-06 06:36:09 +0000 @@ -153,6 +153,11 @@ mySTL/algorithm\.hpp: is used uninitiali listener.cc : .*conversion from 'SOCKET' to 'int'.* net_serv.cc : .*conversion from 'SOCKET' to 'int'.* +# +# Ignorable warnings from header files +# +backward_warning\.h : This file includes at least one + # allow a little moving space for the warning below mi_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 560-600 ma_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550-650