maria:10.0-tokudb-merge

Last commit made on 2016-02-17
Get this branch:
git clone -b 10.0-tokudb-merge https://git.launchpad.net/maria

Branch merges

Branch information

Name:
10.0-tokudb-merge
Repository:
lp:maria

Recent commits

bcc1f2c... by Sergei Golubchik on 2016-02-17

TokuDB fixes to compile in MariaDB

6d26b6b... by Sergei Golubchik on 2016-02-17

Merge branch 'merge-tokudb-5.6' into 10.0

5.6.28-76.1

this is just the merge, the code doesn't compile

0a3f505... by Sergei Golubchik on 2016-02-16

5.6.28-76.1

c46cb62... by Sergei Golubchik on 2016-02-16

Merge branch 'merge-tokudb-5.6' into 10.0

null-merge of file renames in merge-tokudb-5.6

9b14a56... by Sergei Golubchik on 2016-02-16

move mysql-test to storage/tokudb/, rename suites

77b5484... by Sergei Golubchik on 2016-02-16

Merge branch 'connect/10.0' into 10.0

b6bcd0f... by Sergei Golubchik on 2016-02-16

Merge branch 'merge-perfschema-5.6' into 10.0

7e22a1d... by Sergei Golubchik on 2016-02-16

5.6.29

17a792a... by Sergei Golubchik on 2016-02-16

Merge branch 'merge-xtradb-5.6' into 10.0

c8fcaf8... by Sergei Golubchik on 2016-02-16

Merge branch 'merge-innodb-5.6' into 10.0