mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
183607 commits 2788 branches 343 tags 1.7 GiB
Commit graph

116 commits

Author SHA1 Message Date
Sergei Golubchik
04726f2920 get rid of cmake warning 2020-05-27 15:56:40 +02:00
Oleksandr Byelkin
ca091e6372 Merge branch '10.1' into 10.2 2020-05-02 08:44:17 +02:00
Oleksandr Byelkin
da1fbcb665 Merge branch 'merge-tokudb-5.6' into 10.1 2020-04-30 18:56:55 +02:00
Oleksandr Byelkin
15db581ecb 5.6.47-87.0 2020-04-30 18:29:36 +02:00
Oleksandr Byelkin
23c6fb3e62 Merge branch '5.5' into 10.1 2020-04-30 17:36:41 +02:00
Marko Mäkelä
7aa443ca7d Remove an unused tokuvalgrind script 
This is the only symlink in the repository. Symlinks can cause
trouble when using file systems or operating systems that do not
support them.

Also remove the unused file DartConfig.cmake that refers to the script.
 2020-01-23 16:31:25 +02:00
Oleksandr Byelkin
3a1716a7e7 Merge branch '10.1' into 10.2 2020-01-20 16:15:05 +01:00
Oleksandr Byelkin
7993f893b8 Merge branch 'merge-tokudb-5.6' into 10.1 2020-01-19 14:37:25 +01:00
Oleksandr Byelkin
6cb208107e 5.6.46-86.2 2020-01-19 14:08:35 +01:00
Oleksandr Byelkin
36f67a7dff Merge branch '10.1' into 10.2 2019-10-30 21:33:01 +01:00
Oleksandr Byelkin
b58c38a3a9 Merge branch 'merge-tokudb-5.6' into 10.1 2019-10-30 13:49:25 +01:00
Oleksandr Byelkin
a3553a1387 5.6.45-86.1 2019-10-30 11:15:05 +01:00
Oleksandr Byelkin
32c6f40a63 Merge branch '10.1' into 10.2 2019-07-26 13:39:17 +02:00
Oleksandr Byelkin
4177181e16 Merge branch 'merge-tokudb-5.6' into 10.1 2019-07-26 10:48:12 +02:00
Oleksandr Byelkin
24a0d7c507 5.6.44-86.0 2019-07-26 08:48:46 +02:00
Marko Mäkelä
4bbd8be482 Merge 10.1 into 10.2 2019-06-12 10:30:01 +03:00
Sergey Vojtovich
dd939d6f7e MDEV-15734 - calculation inside sizeof() warning 
Reverted incorrect change introduced by 548d03d7.

As result is char**, third qsort() parameter must be sizeof(char*).
Not sizeof(result[0] + 2), which is same as sizeof(result[0]).
Not even sizeof(result[0]) + 2, which would cause invalid memory access.

Proper sorting is responsibility of logfilenamecompare() callback.
 2019-05-30 19:52:31 +04: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
Sergei Golubchik
33d8a28367 5.6.43-84.3 2019-04-26 17:02:15 +02: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
Marko Mäkelä
a249e57b68 Merge 10.1 into 10.2 
Temporarily disable a test for
commit 2175bfce3e
because fixing it in 10.2 requires updating libmariadb.
 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
Oleksandr Byelkin
28f08d3753 Merge branch '10.1' into 10.2 2018-09-14 08:47:22 +02: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
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 Merge branch 'merge-tokudb-5.6' into 10.0
 2018-06-10 10:12:34 +03: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
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
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