#At lp:maria/5.2 based on revid:monty@askmonty.org-20100806080544-7luz55q1gjmm2k95 2839 Michael Widenius 2010-08-06 [merge] Merge with 5.1 modified: configure.in mysql-test/suite/innodb_plugin/t/innodb-timeout.test mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt mysql-test/suite/percona/percona_slow_query_log-long_query_time.result mysql-test/suite/percona/percona_slow_query_log-long_query_time.test support-files/compiler_warnings.supp === modified file 'configure.in' --- a/configure.in 2010-08-05 19:56:11 +0000 +++ b/configure.in 2010-08-06 08:12:37 +0000 @@ -13,8 +13,8 @@ dnl When changing the major version numb dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. dnl -dnl When merging new MySQL releases, update the version number to match the -dnl MySQL version number. +dnl When merging new MariaDB releases, update the version number to match the +dnl MariaDB version number. dnl dnl Note: the following line must be parseable by win/configure.js:GetVersion() AC_INIT([MariaDB Server], [5.2.1-MariaDB-beta], [], [mysql]) === 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 'mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt' --- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt 2010-08-03 10:54:05 +0000 +++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt 2010-08-06 07:46:51 +0000 @@ -1 +1 @@ ---slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2 \ No newline at end of file +--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=3 === modified file 'mysql-test/suite/percona/percona_slow_query_log-long_query_time.result' --- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result 2010-08-05 09:28:19 +0000 +++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.result 2010-08-06 07:46:51 +0000 @@ -1,22 +1,21 @@ SELECT sleep(1); sleep(1) 0 -SELECT sleep(3); -sleep(3) +SELECT sleep(6); +sleep(6) 0 -SELECT sleep(5); -sleep(5) +SELECT sleep(10); +sleep(10) 0 -set long_query_time=4; +set long_query_time=8; SELECT sleep(1); sleep(1) 0 -SELECT sleep(3); -sleep(3) +SELECT sleep(6); +sleep(6) 0 -SELECT sleep(5); -sleep(5) +SELECT sleep(12); +sleep(12) 0 -set long_query_time=2; cat MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time 3 === modified file 'mysql-test/suite/percona/percona_slow_query_log-long_query_time.test' --- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test 2010-08-05 09:28:19 +0000 +++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test 2010-08-06 07:46:51 +0000 @@ -1,16 +1,14 @@ source include/have_innodb.inc; SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); +SELECT sleep(6); +SELECT sleep(10); -set long_query_time=4; +set long_query_time=8; SELECT sleep(1); -SELECT sleep(3); -SELECT sleep(5); - -set long_query_time=2; +SELECT sleep(6); +SELECT sleep(12); let $MYSQLD_DATADIR= `select @@datadir`; let $cmd = cat $MYSQLD_DATADIR/percona_slow_query_log-long_query_time.log | grep -c Query_time; === 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