Michael Widenius e063e3fd60 Merge with 5.2

2011-07-01 15:16:10 +03:00

..

archive

Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned archive tables"

2011-06-11 14:28:15 +03:00

blackhole

merge

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

csv

merge

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

example

small enhancement of the create table options feature:

2011-05-10 18:19:11 +02: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

New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write

2011-06-27 19:07:24 +03:00

ibmdb2i

Fixed typos

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

innobase

merge with 5.1-micro

2011-06-07 18:13:02 +02:00

innodb_plugin

merge with 5.1-micro

2011-06-07 18:13:02 +02:00

maria

Merge with 5.2

2011-07-01 15:16:10 +03:00

myisam

Merge 5.2 -> 5.3

2011-06-24 21:43:31 +04:00

myisammrg

Merge with MariaDB 5.2

2011-05-10 18:17:43 +03: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 5.2 -> 5.3

2011-06-24 21:43:31 +04: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-micro

2011-06-07 18:13:02 +02:00

Makefile.am

…

mysql_storage_engine.cmake

Small CMake fixes :

2011-05-15 13:38:18 +02:00