Michael Widenius 4ab7a33e1e Automatic merge

2012-03-05 22:00:24 +02:00

..

archive

Merge with MariaDB 5.2

2012-02-21 01:58:50 +02:00

blackhole

Merge with MariaDB 5.1

2011-11-24 18:48:58 +02:00

csv

Merge with MariaDB 5.1

2011-11-24 18:48:58 +02:00

example

Fixed buildbot warnings

2011-12-03 20:44:54 +02:00

federated

Merge with 5.1

2011-11-30 22:57:18 +02:00

federatedx

…

heap

Merge with 5.2.

2011-12-11 11:34:44 +02:00

ibmdb2i

…

innobase

Merge with MariaDB 5.2

2012-02-21 01:58:50 +02:00

innodb_plugin

Removed const declarations to get rid of compiler warnings. The changes are similar to what is done in innobase in MySQL 5.5

2012-02-24 12:34:47 +02:00

maria

Automatic merge

2012-03-05 22:00:24 +02:00

myisam

Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable keys' is running may corrupt the table"

2012-02-28 23:18:52 +02:00

myisammrg

Merge with 5.2.

2011-12-11 11:34:44 +02:00

ndb

Merge with MariaDB 5.1

2011-11-24 18:48:58 +02:00

oqgraph

LPBUG#906638 : Fixes to build oqgraph with boost 1.48

2011-12-22 15:50:33 +01:00

pbxt

Merge with 5.2

2011-12-14 20:36:51 +02:00

sphinx

Fix gcc 4.6 warning after merge with 5.1

2011-10-27 19:18:25 +03:00

xtradb

Merge with MariaDB 5.2

2012-02-21 01:58:50 +02:00

Makefile.am

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00

mysql_storage_engine.cmake

on windows: don't link all plugins with mysqld, only do it for storage engines.

2011-12-29 22:52:13 +01:00