Luis Soares 2ad0d6910c BUG#42829: manually merged approved bzr bundle from bug report. ...

Conflicts
=========

Text conflict in sql/sql_class.cc
1 conflicts encountered.

2009-11-01 23:13:11 +00:00

..

binlog

BUG#42829: manually merged approved bzr bundle from bug report.

2009-11-01 23:13:11 +00:00

bugs

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

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

federated

Manual merge.

2009-09-30 19:25:06 -03:00

funcs_1

5.0-bugteam->5.1-bugteam merge

2009-10-28 13:23:02 +04: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

Applying InnoDB Plugin 1.0.5 snapshot, part 10

2009-10-09 19:07:47 +05:30

jp

Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA)

2009-09-11 15:52:08 +03:00

large_tests

…

manual

manual merge for bug_29136, bug#29309.

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

ndb

Define MASTER_MYSOCK for ndb tests.

2009-06-09 19:32:32 -03:00

ndb_team

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

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

parts

automerge

2009-09-18 16:35:40 +03:00

rpl

Bug #46828 rpl_get_master_version_and_clock fails on PB-2

2009-10-29 10:26:59 +08:00

rpl_ndb

BUG#44661: automerge local 5.1-bt bug branch --> local 5.1-bt up to date

2009-10-07 22:26:36 +01:00

stress

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

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

sys_vars

Bug #42778: delete order by null global variable causes

2009-05-22 01:22:46 +05:00