a82ea9def3Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
Mark Riddoch
2014-09-24 10:22:03 +01:00
e8b5c2cbdfUpdates to maxadmin to prevent hang when maxscale shuts down Addition of maxadmin test script
Mark Riddoch
2014-09-24 10:04:36 +01:00
2b147a9ea4Monitors waited monitor check interval time before checking backend servers for the first time. Removed wait for the first check. Added extra debugging to query_classifier to assist in issue resolution regarding to optimized MaxScale builds and pthread_mutex_lock in sql/sql_class.h
VilhoRaatikka
2014-09-24 12:03:04 +03:00
4d6bcdbfc1Merge branch 'release-1.0beta-refresh' into query_classifier_test
Markus Makela
2014-09-24 09:58:30 +03:00
0b143584c6Added comments and removed redundant dependency checking
Markus Makela
2014-09-24 09:57:17 +03:00
4743b2e5bfMerge branch 'release-1.0beta-refresh' into filter_harness
Markus Makela
2014-09-24 09:26:20 +03:00
eae2c03924Merge branch 'release-1.0beta-refresh' into cmake_build
Markus Makela
2014-09-24 09:25:50 +03:00
7562d49a95Addition rtdsc for tracing purposes
Mark Riddoch
2014-09-23 22:09:36 +01:00
2c0b549b58Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
Mark Riddoch
2014-09-23 12:04:37 +01:00
3a1fb1e93bMerge pull request #46 from skysql/MAX-265
Vilho Raatikka
2014-09-23 13:24:04 +03:00
45f8585804Fix to bug #549, http://bugs.skysql.com/show_bug.cgi?id=549 Each monitor loops 10 times/second (sleep 100ms) and perform monitoring checks only when monitor's interval is spent. Monitors notice faster if the shutdown flag is set and thus overall shutdown is faster. hint.c:added missing header Changed interval from unsigned long to size_t which is guaranteed to be of same size also in windows (if possible).
VilhoRaatikka
2014-09-23 11:26:15 +03:00
b78082f8f1Merge branch 'release-1.0beta-refresh' into cmake_build
Markus Makela
2014-09-23 10:42:47 +03:00
a71971cf53Make EPOLLRDHUP conditional to allow CentOS5 builds
Mark Riddoch
2014-09-23 08:04:45 +01:00
869de924d9Fix issue with commands tha produce no putput hanging maxadmin
Mark Riddoch
2014-09-23 01:06:14 +01:00
1c07f10d50process remaining non-option command line arguments as command string or command file to source (as before)
Hartmut Holzgraefe
2014-09-22 18:37:27 +02:00
10f951bb75Added a custom flag for the level of optimization
Markus Makela
2014-09-22 19:03:16 +03:00
e325819348changed Release build optimization to -O2 from -O3 due to -O3 causing bugs
Markus Makela
2014-09-22 18:38:28 +03:00
d548d74beefixed some variables being compared to the wrong string
Markus Makela
2014-09-22 15:26:24 +03:00
b0514e9d9fMerge branch 'cmake_build' into query_classifier_test
Markus Makela
2014-09-22 14:39:02 +03:00
07d1265acftest implementation
Markus Makela
2014-09-22 14:32:18 +03:00
fc848665e5Added variables for RabbitMQ headers and libraries, added more error checks.
Markus Makela
2014-09-22 13:14:53 +03:00
bf0d41674dDroppped CMake requirement to 2.6
Markus Makela
2014-09-22 11:34:39 +03:00
d27522a6f9Merge branch 'release-1.0beta-refresh' into cmake_build
Markus Makela
2014-09-22 11:12:14 +03:00
3d4dc48c8bfixed double linking of the embedded library in a statically built internal library
Markus Makela
2014-09-20 20:24:04 +03:00
3f0de666acChanged the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.
Markus Makela
2014-09-20 19:44:30 +03:00
8427b83884fixed some variables missing the FORCE keyword
Markus Makela
2014-09-20 10:48:20 +03:00
503b942b5cbug 506 - add command line option (-l --log=file) to log to file or shared memory. Only affects trace and debug logs.
Mark Riddoch
2014-09-19 18:24:11 +01:00
fd92b60336Merge branch 'hholzgra-hartmut-getopt_long' into release-1.0beta-refresh
Mark Riddoch
2014-09-19 17:43:41 +01:00
c4fb3e490bBug 546 - use of weghtby causes entry in error log
Mark Riddoch
2014-09-19 15:52:44 +01:00
d561ccb089Merge branch 'release-1.0beta-refresh' into blr
Mark Riddoch
2014-09-19 13:42:37 +01:00
5721df5176Add initial file number
Mark Riddoch
2014-09-19 13:40:38 +01:00
2d2fc28b07Addition of code to prevent multiple hangup's beign processed on the same DCB
Mark Riddoch
2014-09-19 11:40:16 +01:00
2402d55de6Some general tidyup plus addition of code to block zombie processing if epoll_wait returned multiple descriptors
Mark Riddoch
2014-09-19 10:50:54 +01:00
72550185abadd 'rt' to test_filter libs list
Timofey Turenko
2014-09-19 12:35:20 +03:00
3d030d0c7dadded missing test linker flags
Markus Makela
2014-09-19 11:58:22 +03:00
0f62a1c8a4Merge remote-tracking branch 'origin/cmake_build' into cmake_build
Markus Makela
2014-09-19 11:42:43 +03:00
c868fedb87Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file.
Markus Makela
2014-09-19 11:41:44 +03:00
a5975d8cffMerge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh
Mark Riddoch
2014-09-19 08:03:16 +01:00
38475939c4change install dir to /usr/local/skysql/maxscale
Timofey Turenko
2014-09-18 23:07:13 +03:00
c97cbd0a7ffixed typos and old information from files
Markus Makela
2014-09-18 15:56:06 +03:00
942174e94fremoved manual UBUNTU flag and renamed it to DEB_LIKE and made it automated
Markus Makela
2014-09-18 15:50:58 +03:00
b6ab18166eDebian/Ubuntu install scripts
Markus Makela
2014-09-18 15:30:23 +03:00
83aed02651fixed wrong debian package architecture
Markus Makela
2014-09-18 13:27:06 +03:00
c2ba3abac2fixed linker errors in log_manager
Markus Makela
2014-09-18 12:55:36 +03:00
26e2695491Merge branch 'release-1.0beta-refresh' into cmake_build
Markus Makela
2014-09-18 11:13:24 +03:00
7471911087added missing debug compiler flags and tuned library linking flags
Markus Makela
2014-09-18 11:05:40 +03:00
0f3db1c091First changes for fixing #548, http://bugs.skysql.com/show_bug.cgi?id=548 dcb.c:dcb_process_zombies:added new parameter which tells what DCB the thread will use after calling dcb_process_zombies. Thus, processing that DCB is skipped. readwritesplit.c:routeQuery:removed double free call for query buffer.
VilhoRaatikka
2014-09-17 18:02:44 +03:00
675baad4b1Fixed typo
Mark Riddoch
2014-09-17 14:54:40 +01:00
95edddcbe5Added debug output for dependency searches with -DDEBUG_OUTPUT=Y
Markus Makela
2014-09-17 12:59:54 +03:00
e1118fb569added check for packaging tools
Markus Makela
2014-09-16 16:42:46 +03:00
c642af7891Add binlogrouter back into Makefile following merge
Mark Riddoch
2014-09-16 14:28:47 +01:00
b3c110d8e6fix to dependency checks
Markus Makela
2014-09-16 15:54:51 +03:00
77e0cccda6Fix to query_classifier not being linked at all when using cmake
Markus Makela
2014-09-16 15:41:46 +03:00
81d82e9037Merge branch 'release-1.0beta-refresh' into blr
Mark Riddoch
2014-09-16 13:22:03 +01:00
0f5cfdbd1aAdded dependency checks, Debian packaging and fixes to various parts of the CMake build files.
Markus Makela
2014-09-16 15:02:43 +03:00
48c25155f5Completion to fix for http://bugs.skysql.com/show_bug.cgi?id=547 server.h:added macro SERVER_IS_ROOT_MASTER for finding valid candidate for root master readwritesplit.c: wrote open three if conditions in get_root_master_bref for clarity
VilhoRaatikka
2014-09-16 14:49:04 +03:00
f3d32087d8Performance improvement or streaming large result sets.
Mark Riddoch
2014-09-16 12:37:57 +01:00
41226692acMerge branch 'release-1.0beta-refresh' into cmake_build
Markus Makela
2014-09-16 12:11:17 +03:00
8667bf27cbFixed packaging problems
Markus Makela
2014-09-15 14:52:47 +03:00
1f56db310dChanged 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
Markus Makela
2014-09-15 14:12:55 +03:00
Mark Riddoch