Luis Soares af67056f28 Manual merge from mysql-next-mr bug branch. ...

Conflicts
=========
  Text conflict in sql/sql_base.cc

2010-02-10 22:27:23 +00:00

..

binlog

Manual merge from mysql-next-mr bug branch.

2010-02-10 22:27:23 +00:00

bugs

…

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

Auto-merge from mysql-next-mr.

2010-01-21 12:14:34 +03:00

funcs_2

…

ibmdb2i

Bug#49329 example (and other) engines use wrong collation for open tables hash

2009-12-11 12:31:16 +05:30

innodb

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

jp

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

large_tests

This is the downport of

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

manual

…

ndb

1. Disable ndb_condition_pushdown.test due to Bug 49746.

2010-02-09 13:16:01 +03:00

ndb_team

…

parts

merge

2010-02-10 11:08:39 +01:00

perfschema

Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc

2010-01-27 09:34:13 -07:00

perfschema_stress

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

rpl

Automerge from mysql-trunk-bugfixing.

2010-02-10 12:16:49 +00:00

rpl_ndb

1. Disable ndb_condition_pushdown.test due to Bug 49746.

2010-02-09 13:16:01 +03:00

stress

…

sys_vars

Manual merge from mysql-next-mr.

2010-02-05 15:05:37 +03:00