mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
%!d() commits 2786 branches 343 tags 1.7 GiB
Commit graph

187 commits

Author SHA1 Message Date
Marko Mäkelä
9c34a4124d Merge 10.0 into 10.1 2018-04-24 09:26:40 +03:00
Sergey Vojtovich
226ec99a3e MDEV-15510 - storage/oqgraph: Quench warnings with Boost 1.66 
Moved Boost configuration definitions before first inclusion of Boost
headers to avoid re-definition.
 2018-04-11 14:22:10 +04:00
Vicențiu Ciorbaru
4c89cff558 Merge branch '10.0' into 10.1 2018-04-07 17:11:22 +03:00
Sergey Vojtovich
400a8eb60f MDEV-15291 - OQGraph fails to build on FreeBSD 
Boost includes sys/param.h on FreeBSD, which in turn defines setbit()
macro. This macro is conflicting with open_query::judy_bitset::setbit().

Reordered includes such that oqgraph_judy.h never sees this macro.
Also removed duplicate includes of graphcore-config.h, which is included
by graphcore-graph.h/oqgraph_shim.h/oqgraph_thunk.h.
 2018-04-06 13:33:08 +04:00
Sergei Golubchik
9d2e2d7533 Merge branch '10.0' into 10.1 2017-10-22 13:03:41 +02:00
Vicențiu Ciorbaru
1cfcb58539 Fix oqgraph compilation with Boost versions <=1.49 2017-10-09 20:30:52 +03:00
Heinz Wiesinger
4d33c74224 MDEV-10980: Fix reverse queries in OQGRAPH. 2017-10-09 14:37:45 +03:00
iangilfillan
f0ec34002a Correct FSF address 2017-03-10 18:21:29 +01:00
Sergey Vojtovich
fa137476ff MDEV-11941 - Lintian complains about executable bits 
Revoked executable bit from files that are not supposed to be executed directly.
Removed interpreted from files that are not supposed to be executed directly.
Added interpreter to files that are supposed to be executed directly.
 2017-03-07 22:28:33 +04:00
Marko Mäkelä
adc91387e3 Merge 10.0 into 10.1 2017-03-03 13:27:12 +02:00
Michael Widenius
d7a9aed43f Fixed test failing as myisam table was deleted before oqgraph table. 2017-02-28 16:10:47 +01:00
Sergei Golubchik
a98c85bb50 Merge branch '10.0-galera' into 10.1 2016-11-02 13:44:07 +01:00
Don Lewis
3321f1adc7 MDEV-5944: Compile fix for OQGRAPH with LLVM 
Clang/LLVM has more strict schemantics than gcc.

This patch quantifies the namesspace such that it will
compile using clang.
 2016-10-25 13:46:28 +03:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Dimitri John Ledkov
26bf066d56 MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+ 
This used to be a compile failure. The defined structure isn't required
in the later versions of boost.

Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
 2016-06-22 16:41:38 +03:00
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Sergei Golubchik
80da57cc4f remove the forgotten PARENT_SCOPE 2016-05-03 20:13:58 +02:00
Vladislav Vaintroub
67723e9618 Move MYSQL_ADD_PLUGIN outside of IF(OQGRAPH_OK) condition, 
otherwise the plugin does not get compiled if
cmake is called multiple times.
 2016-05-03 15:23:34 +02:00
Vladislav Vaintroub
673efd0648 MDEV-10015 Fix oqgraph compilation on Windows 2016-05-03 15:18:55 +02:00
Andrew McDonnell
23b1b69b10 Comment from https://github.com/MariaDB/server/pull/153 2016-04-24 18:15:20 +02:00
Andrew McDonnell
6651005e62 Fix for MDEV-8206, as per Jira comments of 2015-11-16 and 2015-11-30 2016-04-24 18:15:20 +02:00
Sergey Vojtovich
250a89cfec MDEV-9283 - Debian: the Lintian complains about "shlib-calls-exit" in 
ha_oqgraph.so

exit() was called by Judy error handler. This patch overrides Judy error handler
so that it calls abort() instead of exit().
 2016-04-22 15:30:10 +04:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergei Golubchik
22ebf3cb45 MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11" 
10.0 part of the fix
 2016-03-21 11:55:03 +01:00
Sergei Golubchik
d158ba62f7 ASAN error in OQGraph engine 
Fixed more cases for MDEV-6282
 2016-03-21 11:43:19 +01:00
Sergei Golubchik
3fdc6140a3 update plugins' maturity levels 2016-03-18 22:05:23 +01:00
Andrew McDonnell
59b6b99ce3 Added regression test for MDEV_5871 2016-02-17 21:46:32 +04:00
Sergei Golubchik
a0114b8627 cmake: don't repeat yourself 
make repeated cmake runs less verbose:
* remove few not very useful MESSAGE's
* only run pkg_check_modules() if there's no cached result
* only print QQGraph messages on the first run
 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
7bfda275a1 MDEV-8128 cmake fails to detect boost libraries 2015-06-16 23:58:14 +02:00
Sergei Golubchik
5091a4ba75 Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
Andrew McDonnell
a235504b75 Ensure VERBOSE_DEBUG is off by default 2015-02-28 22:43:18 +10:30
Andrew McDonnell
2b9aba3b55 Updated (C) message to 2015, and changelog 2015-02-28 22:43:04 +10:30
Andrew McDonnell
c65f323836 Fixed more cases for MDEV-6282 2015-02-28 22:37:06 +10:30
Andrew McDonnell
e32dafe778 Hopefully finally fixes MDEV-6282, MDEV-5748 and MDEV-6345 2015-02-28 22:37:06 +10:30
Andrew McDonnell
f8e0f1a823 Minor code cleanup: validation of options to member function. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
fbcabb24ce Fixed minor spelling mistake. 2015-02-28 22:37:05 +10:30
Andrew McDonnell
6ff6bf8aa3 Added regression test for MDEV-6345 2015-02-28 22:37:04 +10:30
Andrew McDonnell
a657abd63f Added extra debug to support MDEV-6282 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:04 +10:30
Andrew McDonnell
e72abc5a96 Minor fix: make sure alter table wont try to change our storage engine to something else. 2015-02-28 22:37:04 +10:30
Andrew McDonnell
79246ebfe9 Partial code tidy: move plugin description to end with other items, and added status variable for debug. 2015-02-28 22:37:03 +10:30
Andrew McDonnell
13e30c0063 Removed dead code and support for dead (<10.0.5) versions of mariadb 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:37:03 +10:30
Andrew McDonnell
abf1e259f6 Partial whitespace cleanup. 
Conflicts:
	storage/oqgraph/ha_oqgraph.cc

Conflicts:
	storage/oqgraph/ha_oqgraph.cc
 2015-02-28 22:29:43 +10:30
Andrew McDonnell
826141368c Added regression test for MDEV-6282 2015-02-28 22:29:42 +10:30
Andrew McDonnell
1973c00970 Update 2014 (C) message 2015-02-28 22:02:58 +10:30
Sergei Golubchik
db227616d2 followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins" 
Remove ONLY_IF clause in MYSQL_ADD_PLUGIN and the requirement
that every plugin's CMakeLists.txt *must* do MYSQL_ADD_PLUGIN
for PLUGIN_XXX=YES to work. This was very fragile and cannot be
relied on.

Use a different implementation of =YES check - iterate all
PLUGIN_* variables and see which one doesn't have a matching target.

Revert all ONLY_IF changes in CMakeLists.txt files.
 2015-02-15 22:14:33 +01:00
Sergei Golubchik
4b21cd21fe Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
Sergei Golubchik
b4cd8a8a5a MDEV-7224 OQGraph compile error 
copy the workaround from 5.5
 2015-01-19 14:07:29 +01:00
Sergei Golubchik
69d700ace3 MDEV-5871 support assisted discovery in oqgraph v3 2014-12-04 10:41:52 +01:00
Sergei Golubchik
2ef0312cd9 oqgraph cleanup: remove casts 2014-12-04 10:41:52 +01:00