Sergei Golubchik 57f824b099 post-merge fixes ... sql/slave.cc: add mutex protection, like in sql_parse.cc		2012-05-18 12:42:06 +02:00
..
binlog	merge with mysql-5.1.63	2012-05-17 12:12:33 +02:00
engines	Postfix for Bug#11752408.	2012-02-02 16:22:13 +04:00
federated	mysql-5.1.62 merge	2012-04-05 10:49:38 +02:00
funcs_1	Fixed compiler warning and errors	2011-11-30 20:57:09 +02:00
funcs_2	Changed to Oracle bug numbers	2011-05-24 12:08:13 +05:30
handler	Fix for LP#697610 ha_index_prev(uchar*): Assertion `inited==INDEX' failed with HANDLER + InnoDB in maria-5.3	2011-01-12 15:41:39 +02:00
ibmdb2i	BUG#58079 - Remove the IBM DB2 storage engine	2010-11-11 13:03:17 +03:00
im
innodb	post-merge fixes	2012-05-18 12:42:06 +02:00
innodb_plugin	post-merge fixes	2012-05-18 12:42:06 +02: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
manual	BUG#49978: Replication tests don't clean up replication state at the end	2010-12-19 18:07:28 +01:00
maria	Fixed bug lp:967914 "CHECK TABLE persistently reports table corruption after removing Aria logs"	2012-03-30 13:42:52 +03:00
ndb	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
ndb_team	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
parts	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
pbxt	Fixed test cases that changed as part of fixing bugs with record count and partitioning	2012-04-04 13:20:06 +03:00
percona	Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.	2011-04-29 16:16:42 +02:00
rpl	merge with mysql-5.1.63	2012-05-17 12:12:33 +02:00
rpl_ndb	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
stress
sys_vars	Merge with MySQL 5.1.60	2011-11-23 19:32:14 +02:00