Alexey Kopytov b69a31fad5 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. ... Conflicts: conflict Makefile.am conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test conflict sql/opt_sum.cc conflict sql/set_var.cc conflict sql/sql_base.cc conflict sql/sql_priv.h conflict sql/sql_show.cc		2010-05-24 00:41:18 +04:00
..
binlog	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
bugs	Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY	2009-04-09 16:05:41 +03:00
engines	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-09 02:03:35 +04:00
federated	Patch for 47759 to trunk-bugfixing.	2010-05-05 09:35:38 +02:00
funcs_1	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04: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	Disable innodb.innodb, main.ps_3innodb and main.partition_innodb_plugin	2010-04-30 13:02:36 +03:00
jp	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
large_tests	bug#50296	2010-02-28 19:39:28 +02:00
manual
ndb	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02: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 mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-11 20:02:50 +04:00
perfschema	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
perfschema_stress	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
rpl	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
rpl_ndb	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
stress
sys_vars	Post-fix for Bug#50373: sys_vars.secure_file_priv_basic can not be run	2010-05-12 14:42:39 +04:00