Michael Widenius b32bed74e9 Merge with 5.2 (To get in fixes for Aria)

2011-01-11 19:01:03 +02:00

..

archive

merge

2010-12-06 13:16:49 +01: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

2010-12-06 13:16:49 +01:00

federatedx

Merge with 5.1-release.

2010-12-06 10:25:44 +02:00

heap

Added HANDLER support for MEMORY tables

2011-01-11 18:51:59 +02:00

ibmdb2i

Fixed typos

2011-01-07 13:45:59 +02:00

innobase

Merge.

2010-12-10 23:23:34 -08:00

innodb_plugin

Merge with 5.1

2011-01-11 15:36:41 +02:00

maria

Merge with 5.2 (To get in fixes for Aria)

2011-01-11 19:01:03 +02:00

myisam

Merge with 5.1

2011-01-11 15:36:41 +02:00

myisammrg

Merge with 5.1

2011-01-11 15:36:41 +02:00

ndb

Fixed typos

2011-01-07 13:45:59 +02:00

oqgraph

Merge with 5.1-release.

2010-12-06 10:25:44 +02:00

pbxt

merge

2010-12-06 13:16:49 +01:00

sphinx

MBug#691437: storage/sphinx/plug.in missing from source tarball.

2010-12-17 08:33:36 +01:00

xtradb

Merge with 5.1

2011-01-11 15:36:41 +02:00

Makefile.am

Merge with MySQL 5.1.50

2010-08-27 17:12:44 +03:00

mysql_storage_engine.cmake

Automerge MariaDB 5.1->5.2.

2010-07-09 13:39:19 +02:00