1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius 2010-08-06 11:12:37 +03:00
commit 2b0d16bcd9
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -13,8 +13,8 @@ dnl When changing the major version number please also check the switch
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])

2
mysql-test/suite/innodb_plugin/t/innodb-timeout.test
View File

@ -48,7 +48,7 @@ connection b;
select * from t1 for update;
connection a;
sleep 2;
sleep 3;
commit;
connection b;

2
mysql-test/suite/percona/percona_slow_query_log-long_query_time-master.opt
View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=3

19
mysql-test/suite/percona/percona_slow_query_log-long_query_time.result
View File

@ -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

12
mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
View File

@ -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;

5
support-files/compiler_warnings.supp
View File

@ -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