Nirbhay Choubey 90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0 ...

* Fix for post-merge build failures.

2014-03-26 14:27:24 -04:00

..

include

Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.

2014-02-02 10:00:36 +01:00

r

* bzr merge -rtag:mariadb-10.0.9 maria/10.0

2014-03-26 14:27:24 -04:00

t

MDEV-4447 MariaDB sources should have unix-style line endings everywhere

2014-02-27 12:00:16 +01:00

disabled.def

10.0-base merge

2013-04-15 15:09:22 +02:00