Sergei Golubchik f61f36b386 Merge branch '10.0' into 10.1 ...

Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore

2014-06-13 16:10:25 +02:00

..

include

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

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

r

Merge branch '10.0' into 10.1

2014-06-13 16:10:25 +02:00

t

Merge branch '10.0' into 10.1

2014-06-13 16:10:25 +02:00

disabled.def

10.0-base merge

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