1623 Commits

Author SHA1 Message Date
Markus Makela
0e23979609 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:27:20 +03:00
Mark Riddoch
a82ea9def3 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-24 10:22:03 +01:00
Mark Riddoch
e8b5c2cbdf Updates to maxadmin to prevent hang when maxscale shuts down
Addition of maxadmin test script
2014-09-24 10:04:36 +01:00
VilhoRaatikka
2b147a9ea4 Monitors 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
2014-09-24 12:03:04 +03:00
Markus Makela
0b143584c6 Added comments and removed redundant dependency checking 2014-09-24 09:57:17 +03:00
Markus Makela
eae2c03924 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 09:25:50 +03:00
Mark Riddoch
2c0b549b58 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-23 12:04:37 +01:00
Vilho Raatikka
3a1fb1e93b Merge pull request #46 from skysql/MAX-265
Fix to bug #549, http://bugs.skysql.com/show_bug.cgi?id=549
2014-09-23 13:24:04 +03:00
VilhoRaatikka
b12415c054 Fix to #537, http://bugs.skysql.com/show_bug.cgi?id=537
mysql_thread_end was never called in this function
2014-09-23 12:33:30 +03:00
VilhoRaatikka
45f8585804 Fix 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).
2014-09-23 11:26:15 +03:00
Markus Makela
b78082f8f1 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-23 10:42:47 +03:00
Mark Riddoch
a71971cf53 Make EPOLLRDHUP conditional to allow CentOS5 builds 2014-09-23 08:04:45 +01:00
Mark Riddoch
cd73c33d65 Merge branch 'hartmut-getopt_long' of https://github.com/hholzgra/MaxScale into release-1.0beta-refresh 2014-09-23 01:09:24 +01:00
Mark Riddoch
869de924d9 Fix issue with commands tha produce no putput hanging maxadmin 2014-09-23 01:06:14 +01:00
Hartmut Holzgraefe
1c07f10d50 process remaining non-option command line arguments as command string
or command file to source (as before)
2014-09-22 18:37:27 +02:00
Markus Makela
10f951bb75 Added a custom flag for the level of optimization 2014-09-22 19:03:16 +03:00
Markus Makela
e325819348 changed Release build optimization to -O2 from -O3 due to -O3 causing bugs 2014-09-22 18:38:28 +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
bf0d41674d Droppped CMake requirement to 2.6 2014-09-22 11:34:58 +03:00
Markus Makela
d27522a6f9 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-22 11:12:14 +03:00
Markus Makela
3d4dc48c8b fixed double linking of the embedded library in a statically built internal library 2014-09-20 20:24:04 +03:00
Markus Makela
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
Markus Makela
8427b83884 fixed some variables missing the FORCE keyword 2014-09-20 10:48:20 +03:00
Mark Riddoch
503b942b5c bug 506 - add command line option (-l --log=file) to log to file or
shared memory. Only affects trace and debug logs.
2014-09-19 18:24:11 +01:00
Mark Riddoch
fd92b60336 Merge branch 'hholzgra-hartmut-getopt_long' into release-1.0beta-refresh
Conflicts:
	client/maxadmin.c

Resolved
2014-09-19 17:43:41 +01:00
Mark Riddoch
77896503c8 Merge branch 'hartmut-getopt_long' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-getopt_long 2014-09-19 17:40:29 +01:00
Mark Riddoch
a16f900d6d Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh
Conflicts:
	server/include/dcb.h

Resolved
2014-09-19 17:37:39 +01:00
Mark Riddoch
13ec9a4073 Merge branch 'hartmut-compile-warnings' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-compile-warnings 2014-09-19 17:34:48 +01:00
Mark Riddoch
c4fb3e490b Bug 546 - use of weghtby causes entry in error log 2014-09-19 15:52:44 +01:00
Mark Riddoch
2d2fc28b07 Addition of code to prevent multiple hangup's beign processed on the same
DCB
2014-09-19 11:40:16 +01:00
Mark Riddoch
2402d55de6 Some general tidyup plus addition of code to block zombie processing
if epoll_wait returned multiple descriptors
2014-09-19 10:50:54 +01:00
Timofey Turenko
72550185ab add 'rt' to test_filter libs list 2014-09-19 12:35:20 +03:00
Markus Makela
3d030d0c7d added missing test linker flags 2014-09-19 11:58:22 +03:00
Markus Makela
0f62a1c8a4 Merge remote-tracking branch 'origin/cmake_build' into cmake_build 2014-09-19 11:42:43 +03:00
Markus Makela
c868fedb87 Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file. 2014-09-19 11:41:44 +03:00
Mark Riddoch
a5975d8cff Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-19 08:03:16 +01: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
b6ab18166e Debian/Ubuntu install scripts 2014-09-18 15:30:23 +03:00
Markus Makela
83aed02651 fixed wrong debian package architecture 2014-09-18 13:27:06 +03:00
Markus Makela
c2ba3abac2 fixed linker errors in log_manager 2014-09-18 12:55:36 +03:00
Markus Makela
26e2695491 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-18 11:13:24 +03:00
Markus Makela
7471911087 added missing debug compiler flags and tuned library linking flags 2014-09-18 11:05:40 +03:00
VilhoRaatikka
0f3db1c091 First 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.
2014-09-17 18:02:44 +03:00
Mark Riddoch
675baad4b1 Fixed typo 2014-09-17 14:54:40 +01:00
Markus Makela
95edddcbe5 Added debug output for dependency searches with -DDEBUG_OUTPUT=Y 2014-09-17 12:59:54 +03:00
VilhoRaatikka
f0b358bea6 Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-17 11:49:39 +03:00
Markus Makela
3776fdb015 added a 'testall' target which builds and runs the tests 2014-09-17 10:39:47 +03:00