Alexander Nozdrin 2b0f6b5ace Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/suite/rpl/r/rpl_binlog_grant.result - mysql-test/suite/rpl/r/rpl_sp.result - mysql-test/suite/rpl/t/rpl_binlog_grant.test - sql/sql_parse.cc - sql/sql_table.cc - sql/sql_test.cc		2010-01-31 01:06:50 +03:00
..
binlog	Auto-merge from mysql-5.1-bugteam.	2010-01-30 21:27:06 +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	Auto-merge from mysql-next-mr.	2010-01-21 12:14:34 +03:00
funcs_2	merge 5.0-> 5.1	2009-04-24 13:00:17 -04:00
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	manual merge for bug_29136, bug#29309.	2007-10-13 23:12:50 +03:00
ndb	Manual merge from mysql-trunk-merge.	2010-01-30 23:09:31 +03:00
ndb_team	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
parts	Manual merge from next-mr.	2010-01-12 20:07:09 +08:00
perfschema	Merge backport of WL#3771 with mysql-next-mr.	2010-01-19 20:42:25 +04:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	Manual merge from mysql-trunk-merge.	2010-01-31 01:06:50 +03:00
rpl_ndb	Manual merge from mysql-trunk-merge.	2010-01-31 00:26:38 +03:00
stress	Merge trift2.:/MySQL/M51/mysql-5.1	2008-02-22 16:14:27 +01:00
sys_vars	Manual merge from mysql-trunk-merge.	2010-01-31 01:06:50 +03:00