diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-06 09:36:09 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-06 09:36:09 +0300 |
| commit | 17d01cba25ee0b926afcf3c901ec626f04ffe700 (patch) | |
| tree | 7c35fb6e4b09b8b74afa14e75ca2de1a49231d4f | |
| parent | f0f21036951f6fed2fddeb58375425f957751fd5 (diff) | |
| download | mariadb-git-17d01cba25ee0b926afcf3c901ec626f04ffe700.tar.gz | |
Fixed test case and compiler warnings
mysql-test/suite/innodb_plugin/t/innodb-timeout.test:
More time for test case
support-files/compiler_warnings.supp:
Ignore compiler warning
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb-timeout.test | 2 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_plugin/t/innodb-timeout.test b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test index 34eda7279b2..f6d319c7961 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb-timeout.test +++ b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test @@ -48,7 +48,7 @@ connection b; select * from t1 for update; connection a; -sleep 2; +sleep 3; commit; connection b; diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 7651ae5aee4..94e5b54d6fa 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -153,6 +153,11 @@ mySTL/algorithm\.hpp: is used uninitialized in this function 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 |