Igor Babaev d749c7e600 Merge

2009-11-09 18:32:39 -08:00

..

binlog

Merge MySQL 5.1.39 into MariaDB 5.1.

2009-10-15 23:38:29 +02:00

bugs

Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY

2009-04-09 16:05:41 +03:00

federated

Added federatedx storage engine

2009-10-30 20:50:56 +02:00

funcs_1

Result file update for new FederatedX

2009-11-07 07:29:10 +01:00

funcs_2

merge 5.0-> 5.1

2009-04-24 13:00:17 -04:00

ibmdb2i

Bug#45983 ibmdb2i_create_index_option=1 not working for primary key

2009-07-08 14:40:01 +05:30

im

…

innodb

Don't test innodb-use-sys-malloc under Valgrind.

2009-09-12 09:38:39 +02:00

jp

fixed jp test failures

2009-02-02 14:42:33 +04:00

large_tests

…

manual

manual merge for bug_29136, bug#29309.

2007-10-13 23:12:50 +03:00

maria

Automatic merge with 5.1-merge

2009-10-14 11:09:56 +03:00

ndb

Merge MySQL->MariaDB

2009-09-08 00:50:10 +04:00

ndb_team

Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam

2009-05-31 13:44:41 +08:00

parts

Added missing 'source' command.

2009-10-28 10:08:54 +02:00

pbxt

Merge Mysql 5.1.39 merge into MariaDB trunk

2009-11-06 18:22:32 +01:00

rpl

Merge MySQL 5.1.39 into MariaDB 5.1.

2009-10-15 23:38:29 +02:00

rpl_ndb

Bug #45974: disable test case in 5.1-bugteam

2009-07-06 18:17:39 +03:00

stress

Merge trift2.:/MySQL/M51/mysql-5.1

2008-02-22 16:14:27 +01:00

sys_vars

Merge MySQL->MariaDB

2009-09-08 00:50:10 +04:00

vcol

The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.

2009-10-16 15:57:48 -07:00