Michael Widenius fd1abdd474 Automatic merge

2012-02-21 09:37:56 +02:00

..

binlog

Merge with 5.2.

2011-12-11 11:34:44 +02:00

engines

bug#11766457 - adjusting/modifying the the tests as tests were failing if system time zone is set differently.

2011-10-12 10:10:52 +05:30

federated

Merge with 5.1

2011-11-30 22:57:18 +02:00

funcs_1

Adjusted test cases of the suite funcs_1.

2011-12-16 08:05:14 -08:00

funcs_2

Changed to Oracle bug numbers

2011-05-24 12:08:13 +05:30

handler

Fixed compiler warnings

2011-02-25 20:15:27 +02:00

ibmdb2i

BUG#58079 - Remove the IBM DB2 storage engine

2010-11-11 13:03:17 +03:00

im

…

innodb

Merge with MariaDB 5.2

2012-02-21 01:58:50 +02:00

innodb_plugin

Automatic merge

2012-02-21 09:37:56 +02:00

jp

…

large_tests

…

manual

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

maria

Merge with MariaDB 5.2

2012-02-21 01:58:50 +02:00

ndb

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

ndb_team

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

optimizer_unfixed_bugs

merge with 5.1-micro

2011-06-07 18:13:02 +02:00

oqgraph

oqgraph and sphinx on windows

2010-09-15 17:29:57 +02:00

parts

Merge with 5.2.

2011-12-11 11:34:44 +02:00

pbxt

Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.

2012-02-01 15:48:02 -08:00

percona

Added test case forlp:875797 Using 'innodb_sys_indexes' causes core dump

2011-11-24 19:07:36 +02:00

plugins

plugin renamed socket_peercred -> unix_socket.

2011-12-30 13:57:03 +01:00

rpl

Merge with 5.2.

2011-12-11 11:34:44 +02:00

rpl_ndb

Merge with 5.2.

2011-12-11 11:34:44 +02:00

sphinx

use mtr_verbose() for debug output in suite.pm files

2011-03-01 18:31:33 +01:00

stress

…

sys_vars

Merge with 5.2.

2011-12-11 11:34:44 +02:00

vcol

Backport of:

2012-02-16 20:15:57 +04:00