Jon Olav Hauglid 5045ad38de Partial backport of: ...

revno: 2762 [merge]
committer: Matthias Leich <mleich@mysql.com>
branch nick: mysql-6.0-bugteam-push
timestamp: Wed 2008-08-13 22:05:34 +0200
message:
  Upmerge 5.1 -> 6.0
    ------------------------------------------------------------
    revno: 2497.374.2
    committer: Matthias Leich <mleich@mysql.com>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Wed 2008-08-13 21:44:54 +0200
    message:
      Fix for Bug#37853
          Test "funcs_1.processlist_val_ps" fails in various ways
      + corrections of logic in poll routines
      + minor improvements

2010-01-14 14:03:24 +01:00

..

binlog

Merge next-mr -> next-4284.

2009-12-15 22:59:07 +03:00

bugs

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

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

federated

merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640

2009-11-06 18:35:04 +02:00

funcs_1

Partial backport of:

2010-01-14 14:03:24 +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

innodb

Updates for test cases from innodb-zip-ss6129.

2009-11-05 17:23:50 +04:00

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

This is the downport of

2009-09-11 22:26:35 +02:00

manual

…

ndb

Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,

2009-12-05 02:02:48 +03:00

ndb_team

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

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

parts

Merge next-mr -> next-4284.

2009-12-16 11:33:54 +03:00

rpl

Apply and review:

2009-12-29 15:19:05 +03:00

rpl_ndb

Manual resolving for the following files

2009-12-01 21:07:18 +02:00

stress

…

sys_vars

Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,

2009-12-05 02:02:48 +03:00