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
Sergei Golubchik
f853a99a4f
5.6.30-76.3
2016-06-10 19:47:58 +02:00
Sergei Golubchik
30d9d4e26d
5.6.29-76.2
2016-04-26 20:58:29 +02:00
Sergei Golubchik
a5679af1b1
Merge branch '10.0' into 10.1
2016-02-23 21:35:05 +01:00
Sergei Golubchik
ae6cc54a4a
5.6.28-76.1
2016-02-16 19:44:10 +01:00
Sergei Golubchik
daa4a2c7ee
MDEV-9351 Fix CPU detection for TokuDB on FreeBSD
...
"x86_64" is "amd64" on FreeBSD
2016-02-15 13:02:21 +01:00
Vladislav Vaintroub
1236333333
Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linux x64 system
2016-01-07 17:24:57 +01:00
Vladislav Vaintroub
0f10a5c97a
Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linux x64 system
2015-12-24 21:46:38 +01:00
Sergei Golubchik
a2bcee626d
Merge branch '10.0' into 10.1
2015-12-21 21:24:22 +01:00
Sergei Golubchik
a70f700a03
after merge fix debian builds
2015-12-15 23:34:32 +01: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
Monty
654547b5b4
Fixed problems found by buildbot:
...
- Better error from check_slave_param
- Better error message from TokuDB if it can't be compiled.
- Marked rpl_mixed_drop_create_temp_table and
rpl_stm_drop_create_temp_table as big tests to stop timeout
failures on power8
- Added sync_slave_with_master to semisync_future-7591 to
ensure that slave is up to date with master before calling
rpl_end.
- Disabled compiler warnings from connect and mroonga and on
MacOSX.
Mroonga:
- Fixed bug when testing if file is a normal file that can be deleted
- Marked a lot of date and datetime test to not run on macosx.
This is because mktime() can't handle negative years and this
restricts mroonga so that it can only store dates after the year 1900.
2015-11-27 02:06:58 +02:00
Sergei Golubchik
33ab30dfe2
fix tokudb compilation with bundled zlib
2015-11-19 16:39:40 +01:00
Sergei Golubchik
12c32bd989
MDEV-8962 TokuDB tries to build on OS X, even when disabled in compile flag
...
first add tokudb plugin (MYSQL_ADD_PLUGIN) then add dependent
targets (ADD_SUBDIRECTORY(ft-index))
2015-11-16 07:55:55 +01:00
Sergei Golubchik
2c8c652978
5.6.26-74.0
2015-10-26 12:57:57 +01:00
Sergei Golubchik
e74f91dfd7
cmake: always use the same function to test for compiler flags
...
Fix all cmake tests (including plugin) to use
MY_CHECK_AND_SET_COMPILER_FLAG. And fix that function
to be compatible with cmake 3.0. This way flag checks
are correctly cached (even in cmake 3.0) and properly reused.
2015-09-04 10:32:02 +02:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Sergei Golubchik
810cf362ea
Merge branch '5.5' into 10.0
2015-06-11 20:20:35 +02:00
Sergei Golubchik
b41ad55265
update tokudb version
2015-06-08 21:48:19 +02:00
Sergei Golubchik
5091a4ba75
Merge tag 'mariadb-10.0.19' into 10.1
2015-06-01 15:51:25 +02:00
Sergei Golubchik
49c853fb94
Merge branch '5.5' into 10.0
2015-05-04 22:00:24 +02:00
Sergei Golubchik
e4df6e5799
Merge commit 'tokudb-engine/tokudb-7.5.6' into 5.5
2015-04-27 16:19:54 +02:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
5f510a9175
Merge branch '5.5' into 10.0
2015-03-06 18:41:32 +01:00
