Alexander Nozdrin 09942fe8e8 Manual merge from mysql-trunk-merge. ... Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy		2009-12-16 21:02:21 +03:00
..
binlog	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03: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-bugfixing.	2009-12-10 22:27:28 +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	Disable main.innodb and innodb.innodb-index until BUG#49396 is fixed.	2009-12-03 17:33:24 +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	This is the downport of	2009-09-11 22:26:35 +02:00
manual
ndb	Manual merge from mysql-next-mr.	2009-11-02 14:10:04 +03:00
ndb_team
parts	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
rpl	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
rpl_ndb	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
stress
sys_vars	Backport of Bug#36785 to mysql-next-mr	2009-11-10 16:26:39 -02:00