Commit graph

14 commits

Author SHA1 Message Date
Vicențiu Ciorbaru
13e4bf674e Fix tokudb compilation post merge 2017-08-03 12:22:35 +03:00
Vicențiu Ciorbaru
40e213f210 Merge branch 'merge-tokudb-5.6' into 10.0 2017-08-03 12:11:31 +03:00
Vicențiu Ciorbaru
b1a2031ff9 5.6.36-82.1 2017-08-03 11:48:44 +03:00
Sergei Golubchik
de9ea40f05 Merge branch 'merge/merge-tokudb-5.6' into 10.0 2016-10-25 21:58:59 +02:00
Sergei Golubchik
d9787aa29a 5.6.33-79.0 2016-10-25 17:03:23 +02:00
Vicențiu Ciorbaru
39dceaae60 MDEV-10983: TokuDB does not compile on OS X 10.12
Make use of a different function to get the current tid.

Additionally, librt doesn't exist on OS X. Use System library instead.
2016-10-25 15:12:27 +02:00
Sergei Golubchik
078e510e0a Merge branch 'merge/merge-tokudb-5.6' into 10.0 2016-09-27 19:03:11 +02:00
Sergei Golubchik
e312e2e636 5.6.32-78.1 2016-09-27 17:59:58 +02:00
Vicențiu Ciorbaru
83d5b963bd Fix tokudb jemalloc linking
Linking tokudb with jemalloc privately causes problems on library
load/unload. To prevent dangling destructor pointers, link with the same
library as the server is using.
2016-09-20 12:37:35 +02:00
Vicențiu Ciorbaru
6e02d426d5 Fix compilation failure of TokuDB on BSD-like systems
mincore is defined differently in BSD mincore(void *, size_t, char *) vs
linux variant of: mincore(void *, size_t, unsigned char *).
Account for this difference in TokuDB.
2016-09-13 13:37:05 +02:00
Sergei Golubchik
ca95cc603b Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge
5.6.28-76.1
2016-06-10 20:48:59 +02:00
Sergei Golubchik
15f7f5c6bb Merge branch 'merge-tokudb-5.6' into 10.0 2015-12-15 20:13:09 +01:00
Sergei Golubchik
dcc501aec3 5.6.27-76.0 2015-12-15 17:23:58 +01:00
Sergei Golubchik
2c8c652978 5.6.26-74.0 2015-10-26 12:57:57 +01:00