Oleksandr Byelkin
c07325f932
Merge branch '10.3' into 10.4
2019-05-19 20:55:37 +02:00
Sergei Golubchik
2400e06946
remove -fno-rtti
2019-05-18 20:34:03 +02:00
Marko Mäkelä
be85d3e61b
Merge 10.2 into 10.3
2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130
Merge 10.1 into 10.2
2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
cb248f8806
Merge branch '5.5' into 10.1
2019-05-11 22:19:05 +03:00
Marko Mäkelä
c8f8d5ceb7
Merge 10.3 into 10.4
2019-04-03 11:43:39 +03:00
Marko Mäkelä
c6b8b05be4
Merge 10.2 into 10.3
2019-04-03 11:22:51 +03:00
Marko Mäkelä
dbc716675b
Merge 10.1 into 10.2
2019-04-03 10:32:21 +03:00
Sergei Golubchik
409f69cd74
cmake: only search for libraries that are needed
...
in particular, don't search for libjemalloc.a, which is only
needed for tokudb's ftcxx tests, when the tests aren't going
to be built.
2019-04-02 18:22:37 +02:00
Oleksandr Byelkin
93ac7ae70f
Merge branch '10.3' into 10.4
2019-02-21 14:40:52 +01:00
Oleksandr Byelkin
65c5ef9b49
dirty merge
2019-02-07 13:59:31 +01:00
Marko Mäkelä
a249e57b68
Merge 10.1 into 10.2
...
Temporarily disable a test for
commit 2175bfce3e
2019-02-03 17:22:05 +02:00
Marko Mäkelä
213ece2f2e
Merge 10.1 into 10.1
...
This is joint work with Oleksandr Byelkin.
2019-02-02 13:00:15 +02:00
Oleksandr Byelkin
8c2f3e0c16
Fix detection of version in tokudb
2019-01-28 20:17:54 +01:00
Oleksandr Byelkin
5cdb3fb25e
Merge branch 'merge-tokudb-5.6' into 10.0
2019-01-28 20:15:57 +01:00
Oleksandr Byelkin
13802fef83
5.6.42-84.2
2019-01-24 17:31:13 +01:00
Marko Mäkelä
444c380ceb
Merge 10.3 into 10.4
2018-10-05 08:09:49 +03:00
Sergei Golubchik
57e0da50bb
Merge branch '10.2' into 10.3
2018-09-28 16:37:06 +02:00
Oleksandr Byelkin
28f08d3753
Merge branch '10.1' into 10.2
2018-09-14 08:47:22 +02:00
Sergey Vojtovich
d9613b750c
Enable C++11
2018-09-09 10:05:56 +04:00
Oleksandr Byelkin
31081593aa
Merge branch '11.0' into 10.1
2018-09-06 22:45:19 +02:00
Sergei Golubchik
3a4242fd57
TokuDB: Don't free P_S instrumented mutexes after exit()
...
don't create static objects that destroy mutexes from destructors,
and don't destroy mutexes from .so destructor (on-unload) function.
if it happens after exit(), P_S will be long gone by that time
this fixes tokudb tests crashing on quantal-amd64
2018-09-06 21:06:31 +02:00
Oleksandr Byelkin
d527bf5390
Merge branch 'merge-tokudb-5.6' into 10.0
2018-09-06 21:04:56 +02:00
Sergei Golubchik
64d4181f0c
Fix TokuDB's check for -Wno-address-of-packed-member
...
(failed configure with old clang)
2018-09-04 09:19:47 +02:00
Oleksandr Byelkin
a816eac92a
5.6.41-84.1
2018-09-03 16:29:29 +02:00
Sergei Golubchik
675e7e7dcc
remove obsolete checks for -fno-implicit-templates
...
we stopped using -fno-implicit-templates many years ago
2018-08-12 11:37:43 +02:00
Sergei Golubchik
6b53f9d781
MDEV-16662 CMake warnings: CMP0026
2018-08-12 11:37:42 +02:00
Sergei Golubchik
36e59752e7
Merge branch '10.2' into 10.3
2018-06-30 16:39:20 +02:00
Sergei Golubchik
b942aa34c1
Merge branch '10.1' into 10.2
2018-06-21 23:47:39 +02:00
Vicențiu Ciorbaru
aa59ecec89
Merge branch '10.0' into 10.1
2018-06-12 18:55:27 +03:00
Vicențiu Ciorbaru
24d7cbe1e0
Ensure TokuDB compiles both on Linux and OS X
...
On OS X, (u)int64_t is defined as (unsigned) long long int while on 74
bit Linux it is defined as (unsigned) long int.
Ensure the type matches when doing printf on all systems.
2018-06-11 00:18:12 +03:00
Vicențiu Ciorbaru
e5a3d24b87
Followup for make TokuDB compile with GCC-8
...
Missed printfs from: 21246066b2
2018-06-10 21:45:05 +03:00
Vicențiu Ciorbaru
3ead951180
Merge branch '5.5' into 10.0
2018-06-10 17:16:27 +03:00
Teodor Mircea Ionita
7053e26e18
MDEV-15778: Fix TokuDB build issues on macOS 10.13.4
...
Several issues were encountered and fixed as explained bellow:
* missing link to dbug lib;
* user proper fprintf format specifier;
* ZERO_COND_INITIALIZER was using wrong toku_cond_t struct
initializer for first member of type pthread_cond_t and
not considering the TOKU_PTHREAD_DEBUG case which has
one extra struct member of type pfs_key_t;
* Remove likely(!opt_debug_sync_timeout), argument is
declared extern and not available to Toku;
* pthread_mutex_timedlock() is not available in pthreads
for Mac, as it's not part of the POSIX pthreads spec.
The encompassing event_t::wait(ms) methods are unused,
thus have been removed;
2018-06-10 10:12:34 +03:00
Teodor Mircea Ionita
8f82c48443
MDEV-15778: Restore file permissions lost in merge
...
Permissions were probably due to a file copy in:
15f7f5c6bb
2018-06-10 10:12:34 +03:00
Sergei Golubchik
c9717dc019
Merge branch '10.2' into 10.3
2018-05-11 13:15:10 +02:00
Sergei Golubchik
9b1824dcd2
Merge branch '10.1' into 10.2
2018-05-10 13:01:42 +02:00
Sergei Golubchik
9989c26bc9
Merge branch '10.0' into 10.1
2018-05-05 14:01:59 +02:00
Monty
2ccd6716fc
Fix a lot of compiler warnings found by -Wunused
2018-04-26 17:35:12 +03:00
Sergei Golubchik
1bd33ca82b
Merge branch 'merge-tokudb-5.6' into 10.0
2018-04-26 14:14:51 +02:00
Monty
03da1253af
Fix compilation error when compiling with valgrind
2018-04-26 14:22:09 +03:00
Sergei Golubchik
3cd4da3257
5.6.39-83.1
2018-04-24 16:25:16 +02:00
Monty
965e16376c
TokuDB didn't compile with valgrind
...
TokuDB uses USE_VALGRIND while MariaDB uses HAVE_valgrind
Fixed by defining USE_VALGRIND in TokuDB if HAVE_valgrind is used
2018-02-17 18:04:59 +02:00
Marko Mäkelä
b006d2ead4
Merge bb-10.2-ext into 10.3
2018-02-15 10:22:03 +02:00
Monty
76dc6af24c
TokuDB didn't compile with valgrind
...
TokuDB uses USE_VALGRIND while MariaDB uses HAVE_valgrind
Fixed by defining USE_VALGRIND in TokuDB if HAVE_valgrind
is used
2018-02-10 14:32:24 +02:00
Sergei Golubchik
4771ae4b22
Merge branch 'github/10.1' into 10.2
2018-02-06 14:50:50 +01:00
Sergei Golubchik
d4df7bc9b1
Merge branch 'github/10.0' into 10.1
2018-02-02 10:09:44 +01:00
Vicențiu Ciorbaru
fc3df561d4
Make TokuDB run on 10.0
2018-01-24 17:26:40 +02:00
Vicențiu Ciorbaru
c5f333adb6
Merge branch 'merge-tokudb-5.6' into 10.0
2018-01-24 17:26:15 +02:00
Vicențiu Ciorbaru
f6716cef7e
5.6.38-83.0
2018-01-23 19:20:10 +02:00
