56 Commits

Author SHA1 Message Date
Markus Makela
db1ea422a0 Merge branch 'develop' into MAX-324
Conflicts:
	server/core/modutil.c
2015-01-20 04:25:40 +02:00
Markus Makela
e79ea8bc3e Removed INSTALL_DIR due to bug 689 being fixed and updated README to use 'cmake -LH' instead of listing the variables. 2015-01-18 05:29:37 +02:00
Markus Makela
3af1e895c7 Updated SETUP contents, fixed CMAKE_INSTALL_PREFIX not affecting the install destination and added a WITHOUT_MAXADMIN flag. 2015-01-18 05:20:05 +02:00
Markus Makela
8877d00695 Updated README 2015-01-17 18:10:23 +02:00
Timofey Turenko
ba84370b36 fix type in macros.cmake 2015-01-16 18:12:08 +02:00
Markus Makela
9177b6bcd3 Merge branch 'develop' into MAX-324
Conflicts:
	query_classifier/query_classifier.h
2015-01-13 06:34:22 +02:00
Timofey Turenko
8572a08cab Merge branch 'master' into develop 2015-01-09 11:23:03 +02:00
Timofey Turenko
39c2c818e0 set version to 1.0.5-unstable 2015-01-09 10:51:22 +02:00
Markus Makela
8ce9cd1cbd Fix to wrong version string being used in the macros.cmake . 2015-01-09 05:10:05 +02:00
Timofey Turenko
c8fbe71527 change version number to 1.0.4-stable 2015-01-08 17:51:08 +02:00
Markus Makela
fed828eb29 Merge branch 'release-1.0GA' into MAX-324
Conflicts:
	server/MaxScale_template.cnf
	server/core/service.c
2015-01-06 04:45:30 +02:00
Timofey Turenko
f3c62f4846 set version to 1.0.3 2015-01-06 01:22:23 +02:00
Markus Makela
63006f686d Fixed rwsplit hint tests writing to source tree instead of the build tree. 2014-12-20 16:15:13 +02:00
Markus Makela
e6fca9b50d Added a simple test for dbshard router.
The test sets a session variable and queries a union of this variable and a value in each of the databases.
2014-12-17 14:06:34 +02:00
Timofey Turenko
d607d3ec7c change capital -RC to lowcase -rc in the package name 2014-12-12 13:07:51 +02:00
Timofey Turenko
89c9bb8ade change version from 'beta' to 'RC' 2014-12-11 22:22:52 +02:00
Markus Makela
1b633cceb5 Added a platform check cmake file for future platform checking. 2014-11-26 09:09:08 +02:00
Markus Makela
1b8cef4080 small change to cmake output 2014-11-21 14:20:51 +02:00
Markus Makela
7dc0776346 Fixes to CMake and errmsg.sys file searching with custom file locations. 2014-11-21 14:15:14 +02:00
Markus Makela
990de59241 Added find_package modules for MySQLClient and RabbitMQ and fixed an error in consumer.c 2014-11-19 15:16:10 +02:00
Markus Makela
37fa9668a9 Added a check for MySQL client libraries for the connection tests and re-enabled the tests. 2014-11-10 09:06:23 +02:00
Markus Makela
813529b476 Added a test for the time it takes to login through MaxScale with various routers. 2014-11-07 17:05:21 +02:00
Markus Makela
6de751cd83 Fixed CMake configuration error with -DEMBEDDED_LIB=<path to folder> causing the library not being found. 2014-10-14 19:44:41 +03:00
Markus Makela
2a0233aa30 Updated MaxScale version to 1.0.2 2014-10-14 13:49:33 +03:00
Markus Makela
0fc47efec3 Added a debugging function that outputs debugging messages if DEBUG_OUTPUT=Y 2014-10-14 12:42:40 +03:00
Markus Makela
7165f5d29b Added more checks for RabbitMQ library versions. 2014-10-10 17:14:49 +03:00
Markus Makela
cd1bea82e8 Updated macros.cmake with different string matching parameters on searched libraries. 2014-10-10 14:46:11 +03:00
Markus Makela
8cbfb90ce8 Fixed a missing 'else()' from macros.cmake and used unset instead of set when clearing variables. 2014-10-10 10:31:45 +03:00
Markus Makela
3053775592 Tests aren't built as a default anymore. 2014-10-01 14:48:48 +03:00
Markus Makela
af5eab238d fixed older CMake versions using PATH instead of DIRECTORY in get_filename_component() 2014-09-25 22:24:43 +03:00
Markus Makela
086ad6c782 Updated the MaxScale version to 1.0.1-beta and added a numeric version MAXSCALE_VERSION_NUMERIC with the format 'major.minor.patch'. 2014-09-25 10:40:54 +03:00
Markus Makela
d8d920bdb4 made the searching of MySQL headers look recursively for subdirectories 2014-09-24 18:58:23 +03:00
Markus Makela
7d01fa1619 Reverting to an earlier version due to unforseen bugs in the new implementation 2014-09-24 17:12:55 +03:00
Markus Makela
e30f4b4b95 Cleaned up dependency checking 2014-09-24 15:39:06 +03:00
Markus Makela
9c61dcebaa changed 'Release' build type to 'Optimized' and removed the default -O2 flags 2014-09-24 12:58:44 +03:00
Markus Makela
a0a7a29877 Added more of the status messages under the control of the DEBUG_OUTPUT variable and updated the README. 2014-09-24 12:38:12 +03:00
Markus Makela
0b143584c6 Added comments and removed redundant dependency checking 2014-09-24 09:57:17 +03:00
Markus Makela
d548d74bee fixed some variables being compared to the wrong string 2014-09-22 15:26:24 +03:00
Markus Makela
fc848665e5 Added variables for RabbitMQ headers and libraries, added more error checks.
modified:   CMakeLists.txt
	modified:   README
	modified:   macros.cmake
	modified:   query_classifier/test/canonical_tests/CMakeLists.txt
	modified:   rabbitmq_consumer/CMakeLists.txt
	modified:   server/modules/filter/CMakeLists.txt
2014-09-22 13:14:53 +03:00
Markus Makela
8427b83884 fixed some variables missing the FORCE keyword 2014-09-20 10:48:20 +03:00
Timofey Turenko
38475939c4 change install dir to /usr/local/skysql/maxscale 2014-09-18 23:07:13 +03:00
Markus Makela
c97cbd0a7f fixed typos and old information from files 2014-09-18 15:56:06 +03:00
Markus Makela
942174e94f removed manual UBUNTU flag and renamed it to DEB_LIKE and made it automated 2014-09-18 15:50:58 +03:00
Markus Makela
95edddcbe5 Added debug output for dependency searches with -DDEBUG_OUTPUT=Y 2014-09-17 12:59:54 +03:00
Markus Makela
81b83f1978 Changed the way the static embedded library is searched 2014-09-16 18:16:20 +03:00
Markus Makela
c0112af04e changed the way static library searching is done 2014-09-16 17:53:36 +03:00
Markus Makela
be057a4eef Fixed changing cached values causing linking errors 2014-09-16 17:14:50 +03:00
Markus Makela
b3c110d8e6 fix to dependency checks 2014-09-16 15:54:51 +03:00
Markus Makela
0f5cfdbd1a Added dependency checks, Debian packaging and fixes to various parts of the CMake build files. 2014-09-16 15:02:43 +03:00
Markus Makela
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