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
c5f333adb6
Merge branch 'merge-tokudb-5.6' into 10.0
2018-01-24 17:26:15 +02:00
Vicențiu Ciorbaru
d833bb65d5
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
Vicențiu Ciorbaru
f6716cef7e
5.6.38-83.0
2018-01-23 19:20:10 +02:00
Vicențiu Ciorbaru
a04b07eb34
Fix TokuDB Not building
...
We don't check for DLSYM in CMake, check for DLOPEN instead.
2018-01-23 00:03:41 +02:00
Sergei Golubchik
204cb85aab
Fix compilation without dlopen
2018-01-22 11:39:54 +01:00
Marko Mäkelä
8d70097c21
Merge 10.1 to 10.2
...
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently
return 0 on error
2017-12-19 16:48:28 +02:00
Oleksandr Byelkin
ef9e78c9d4
MDEV-14524 TokuDB is unable to be built on Linux
...
tokudb needs either F_NOCACHE or O_DIRECT, not both
2017-12-14 14:09:51 +01:00
Sergei Golubchik
7f1900705b
Merge branch '10.1' into 10.2
2017-11-21 19:47:46 +01:00
David Carlier
685db2c112
Fix the build on OpenBSD ( #488 )
...
* cast pthread_t for printf
* don't use RTLD_NOLOAD
* tokudb fails without F_NOCACHE and O_DIRECT - ditto
2017-11-17 13:55:14 +08:00
Sergei Golubchik
e0a1c745ec
Merge branch '10.1' into 10.2
2017-10-24 14:53:18 +02:00
Sergei Golubchik
9d2e2d7533
Merge branch '10.0' into 10.1
2017-10-22 13:03:41 +02:00
Sergei Golubchik
da4503e956
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
Sergei Golubchik
d76f5774fe
MDEV-13459 Warnings, when compiling with gcc-7.x
...
mostly caused by -Wimplicit-fallthrough
2017-10-17 07:37:39 +02:00
Vicențiu Ciorbaru
22c322c649
Merge branch '10.1' into 10.2
2017-09-19 12:43:02 +03:00
Vicențiu Ciorbaru
ec6042bda0
Merge branch '10.0' into 10.1
2017-09-19 12:06:50 +03:00
Vicențiu Ciorbaru
745cd57ae7
Merge branch 'merge-tokudb-5.6' into 10.0
2017-09-19 11:18:17 +03:00
Vicențiu Ciorbaru
618d8fdf37
5.6.37-82.2
2017-09-19 10:58:12 +03:00
Sergei Golubchik
79ddd86615
bugfix: don't overwrite tokudb.cnf during the build
2017-09-18 10:12:23 +02:00
Sergei Golubchik
cb1e76e4de
Merge branch '10.1' into 10.2
2017-08-17 11:38:34 +02:00
Sergei Golubchik
8e8d42ddf0
Merge branch '10.0' into 10.1
2017-08-08 10:18:43 +02: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
Marko Mäkelä
8f643e2063
Merge 10.1 into 10.2
2017-05-23 11:09:47 +03:00
Marko Mäkelä
65e1399e64
Merge 10.0 into 10.1
...
Significantly reduce the amount of InnoDB, XtraDB and Mariabackup
code changes by defining pfs_os_file_t as something that is
transparently compatible with os_file_t.
2017-05-20 08:41:20 +03:00
Vicențiu Ciorbaru
4cdae9c12b
Merge branch 'merge-tokudb-5.6' into 10.0
2017-05-16 16:27:50 +03:00
Vicențiu Ciorbaru
97c53cdfcc
5.6.36-82.0
2017-05-16 14:26:11 +03:00
Sergei Golubchik
da4d71d10d
Merge branch '10.1' into 10.2
2017-03-30 12:48:42 +02:00
Sergei Golubchik
bf40e8069c
MDEV-11059 don't build the server with jemalloc
...
don't build the server with jemalloc.
only build tokudb with it.
move tokudb into a separate package, because it brings a new dependency
2017-03-29 00:40:21 +02:00
Marko Mäkelä
ad0c218a44
Merge 10.0 into 10.1
...
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:
recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).
Report progress also via systemd using sd_notifyf().
2017-03-09 08:53:08 +02:00
Vicențiu Ciorbaru
b7a3bce06e
Merge branch 'merge-tokudb-5.6' into 10.0
2017-03-05 02:01:21 +02:00
Vicențiu Ciorbaru
d71df7e1db
5.6.35-80.0
2017-03-05 01:31:32 +02:00
Sergei Golubchik
4a5d25c338
Merge branch '10.1' into 10.2
2016-12-29 13:23:18 +01:00
Sergei Golubchik
2f20d297f8
Merge branch '10.0' into 10.1
2016-12-11 09:53:42 +01:00
Sergei Golubchik
c5ef621599
Merge branch 'merge/merge-tokudb-5.6' into 10.0
2016-12-04 01:59:08 +01:00
Sergei Golubchik
d4f0686cd8
5.6.34-79.1
2016-12-02 10:24:00 +01:00
Sergei Golubchik
a98c85bb50
Merge branch '10.0-galera' into 10.1
2016-11-02 13:44:07 +01:00
Otto Kekäläinen
1877a8cdb4
MDEV-6284: Remove CMakeLists.txt hack that mangled the server install file
...
For Debian the rules file is the main makefile and assuming that a upstream
makefile will mangle the Debian packaging files creates false alerts
from static analysis tools and other problems.
2016-10-27 18:42:16 +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
Sergei Golubchik
66d9696596
Merge branch '10.0' into 10.1
2016-09-28 17:55:28 +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
Sergei Golubchik
6b1863b830
Merge branch '10.0' into 10.1
2016-08-25 12:40:09 +02:00
Sergei Golubchik
077f29a921
Merge branch 'merge/merge-tokudb-5.6' into 10.0
...
5.6.31-77.0
2016-08-10 19:57:13 +02:00
Sergei Golubchik
4f2d214359
5.6.31-77.0
2016-08-10 19:30:20 +02:00
Sergei Golubchik
3361aee591
Merge branch '10.0' into 10.1
2016-06-28 22:01:55 +02:00
Sergei Golubchik
dde558f262
Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge
2016-06-11 01:06:09 +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