Commit Graph

47 Commits

Author SHA1 Message Date
23b2ce004b Added support for MariaDB 10.1 embedded library
The code used in the query classifier was not compatible with 10.1 version
of MariaDB and needed to be fine tuned in order for it to work with all
supported versions of MariaDB.
2015-11-23 11:41:05 +02:00
b22d40b06b Fixed PCRE2 beng built when CMake is configured
The bundled PCRE2 library will be built as a separate target and configuring
CMake no longer builds it. Instead, it will only be built when it is out of date.
This requires all targets to declare that they depend on the pcre2 target in
order for it to be built.
2015-11-16 13:59:47 +02:00
dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.
2015-11-11 11:08:02 +00:00
c1eb84b377 Added utility functions for regular expression matching with the PCRE2 library. 2015-10-31 10:34:37 +02:00
4f316419c5 Merge branch 'develop' into MXS-329 2015-09-30 12:47:28 +03:00
d679bf1cd8 Fix to MXS-389: https://mariadb.atlassian.net/browse/MXS-389
Utility tools now use static log manager.
2015-09-29 14:56:05 +03:00
c1194a5ee8 Fixed test build failures. 2015-09-10 18:07:24 +03:00
753746f5c5 Fix mistakes 2015-08-28 16:12:36 +01:00
70d82fd45e Fixed compilation problems. 2015-08-26 18:33:46 +03:00
820bb4ea00 Avoid name clash - change random to random_jkiss 2015-08-26 16:18:08 +01:00
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
a73df62ebd Renamed mon_exec files to externcmd. 2015-05-18 18:34:43 +03:00
da6d597987 Moved common monitor structures and definitions to a separate header and added master down script to galeramon. 2015-05-07 05:56:13 +03:00
d545150ceb Fix to MXS-70: https://mariadb.atlassian.net/browse/MXS-70
Added assert information to error log.
2015-05-02 05:51:25 +03:00
9e0a2bfc12 Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME. 2015-04-27 21:55:57 +03:00
0cfcad55da Moved get_libdir function to its own file. 2015-04-27 11:06:11 +03:00
2fce114483 Added missing buffer.c from fullcore static lib. 2015-04-27 10:18:43 +03:00
6f1fe003a3 Added missing buffer.c from fullcore static lib. 2015-04-27 10:17:55 +03:00
97653e98fa Fixed a typo in the core CMakeLists.txt 2015-04-27 10:16:01 +03:00
61ebb0fe97 Fixed a typo in the core CMakeLists.txt 2015-04-27 10:14:47 +03:00
d5682bf7c0 Removed file globbing in the core CMake file and used explicit names instead. 2015-04-27 10:14:14 +03:00
5974935f65 Removed file globbing in the core CMake file and used explicit names instead. 2015-04-27 10:11:30 +03:00
16044f5201 Added optional jemalloc linkage. 2015-04-27 05:57:44 +03:00
49907ffdea Added optional jemalloc linkage. 2015-04-27 05:57:16 +03:00
17a7b2addb Updated more variables. 2015-04-26 20:08:27 +03:00
df9bc65430 Added variables that are used when installing instead of relative paths. 2015-04-25 18:35:47 +03:00
b2cfa674b9 Added support for tcmalloc usage. 2015-04-20 17:52:50 +03:00
e9aa692acd Added the platform check back and added linker flags for PCRE if the embedded library does not have them. 2015-04-03 22:14:51 +03:00
89ca0f420a Added a rule parsing tool for the dbfwfilter. The tool can be build with the -DBUILD_TOOLS=Y flag for CMake. 2015-04-03 10:37:21 +03:00
0dd63ceaf1 Added release version string function to config.c 2015-03-04 18:48:38 +02:00
bc5dfe82c2 merge from develop
merge from develop
2015-03-04 17:02:04 +01:00
63e6826906 Added find_package calls for libcurl and linked the maxscale executable against it. 2015-02-26 11:16:50 +02:00
8e941f7523 Addition of the MaxInfo filter and the generic MaxScale resultset 2015-02-18 17:25:13 +00:00
d3c8770852 Merge branch 'blr' into develop
Conflicts:
	client/maxadmin.c
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/core/gateway.c
	server/core/poll.c
	server/core/test/CMakeLists.txt
	server/core/test/makefile
	server/include/poll.h
	server/modules/routing/debugcmd.c
2014-11-19 12:00:55 +00:00
3053775592 Tests aren't built as a default anymore. 2014-10-01 14:48:48 +03:00
0ef87e3cc1 Updates to slave catchup mode to use fake events
Addition of fake EPOLLOUT event mechanism

New memlog feature for debugging purposes
2014-09-30 13:25:45 +01:00
3d4dc48c8b fixed double linking of the embedded library in a statically built internal library 2014-09-20 20:24:04 +03:00
3f0de666ac Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories. 2014-09-20 19:44:30 +03:00
c868fedb87 Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file. 2014-09-19 11:41:44 +03:00
7471911087 added missing debug compiler flags and tuned library linking flags 2014-09-18 11:05:40 +03:00
0f5cfdbd1a Added dependency checks, Debian packaging and fixes to various parts of the CMake build files. 2014-09-16 15:02:43 +03:00
1f56db310d Changed variable names to closer match their usage
Changed the default values to the same as in makefiles
Added configured versions of maxscale.conf and maxscale init.d script
2014-09-15 14:12:55 +03:00
48012cd571 Added more build options and README changes 2014-09-15 11:48:40 +03:00
8697b97617 added missing linker flags 2014-09-11 22:14:17 +03:00
11a7c0d6b6 added gcov and static embedded library flags 2014-09-11 21:50:59 +03:00
7a069ecdf7 added core tests to cmake 2014-09-11 20:08:28 +03:00
b3ce971020 initial implementation of the CMake build system 2014-09-11 18:24:41 +03:00