Igor Babaev 704f97035f Merged the code of MWL#106 into 5.3 ... Resolved all conflicts, bad merges and fixed a few minor bugs in the code. Commented out the queries from multi_update, view, subselect_sj, func_str, derived_view, view_grant that failed either with crashes in ps-protocol or with wrong results. The failures are clear indications of some bugs in the code and these bugs are to be fixed.		2011-05-16 22:39:43 -07:00
..
archive	Merge with 5.1 to get in changes from MySQL 5.1.55	2011-02-28 19:39:30 +02:00
blackhole	merge	2010-12-06 13:16:49 +01:00
csv	merge	2010-12-06 13:16:49 +01:00
example	merge	2010-12-06 13:16:49 +01:00
federated	Merge with 5.1	2011-01-12 17:38:13 +02:00
federatedx	Merge with 5.2	2011-03-09 15:47:59 +02:00
heap	Merged the code of MWL#106 into 5.3	2011-05-16 22:39:43 -07:00
ibmdb2i	Fixed typos	2011-01-07 13:45:59 +02:00
innobase	Merge with 5.2	2011-03-09 15:47:59 +02:00
innodb_plugin	Merge various replication-related patches into MariaDB 5.3:	2011-04-08 09:39:33 +02:00
maria	Merged the code of MWL#106 into 5.3	2011-05-16 22:39:43 -07:00
myisam	Merged the code of MWL#106 into 5.3	2011-05-16 22:39:43 -07:00
myisammrg	Merge with 5.1	2011-01-11 15:36:41 +02:00
ndb	Merge with 5.1 to get in changes from MySQL 5.1.55	2011-02-28 19:39:30 +02:00
oqgraph	Detect Boost installation and build OQGRAPH when possible. For now, disable oqgraph on x64 until	2011-04-10 22:48:28 -07:00
pbxt	Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.	2011-04-01 15:07:10 +02:00
sphinx	MBug#691437: storage/sphinx/plug.in missing from source tarball.	2010-12-17 08:33:36 +01:00
xtradb	Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"	2011-04-28 18:02:26 +03:00
Makefile.am
mysql_storage_engine.cmake	MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order	2011-01-29 18:51:12 +01:00