858 Commits

Author SHA1 Message Date
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
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
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
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
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
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
3776fdb015 added a 'testall' target which builds and runs the tests 2014-09-17 10:39:47 +03:00
Markus Makela
8b1afbfe26 fixed tests not working with the normal 'make testall' 2014-09-16 20:02:28 +03:00
Mark Riddoch
c77807971d Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-16 16:53:06 +01:00
Markus Makela
a5ba0457d0 Merge remote-tracking branch 'origin/release-1.0beta-refresh' into cmake_build 2014-09-16 17:36:35 +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
VilhoRaatikka
48c25155f5 Completion 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
2014-09-16 14:49:04 +03:00
Mark Riddoch
f3d32087d8 Performance improvement or streaming large result sets.
-bash-4.1$ time mysql -h 127.0.0.1 -P4007 -umassi -pmassi information_schema -q -e "select * from engines a, engines b, engines c, engines d, engines e;" > /dev/null

real	1m16.137s
user	0m0.660s
sys	0m0.392s
-bash-4.1$ time mysql -h 127.0.0.1 -P4007 -umassi -pmassi information_schema -q -e "select * from engines a, engines b, engines c, engines d, engines e;" > /dev/null

real	0m0.980s
user	0m0.944s
sys	0m0.027s
2014-09-16 12:37:57 +01:00
Markus Makela
41226692ac Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-16 12:11:17 +03:00
VilhoRaatikka
7300e58787 Fix to #547, http://bugs.skysql.com/show_bug.cgi?id=547
readwritesplit.c:get_dcb now searches for master if slave is not available
2014-09-16 12:11:08 +03:00
Markus Makela
fdf1271138 Cleaned up RabbitMQ component building. 2014-09-16 11:34:05 +03:00
VilhoRaatikka
3dc44ff6fd Fix to bug #544, http://bugs.skysql.com/show_bug.cgi?id=544
Changes to readwritesplit router.
2014-09-15 21:03:11 +03:00
VilhoRaatikka
213a2dba9e Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-15 19:11:39 +03:00
VilhoRaatikka
a41a8d6060 Fix to bug #543, http://bugs.skysql.com/show_bug.cgi?id=543
All counters are now updated in routeQuery
Fix to bug #545, http://bugs.skysql.com/show_bug.cgi?id=545
All sql variable and session modification statements, such as autocommit-, and set <db> commands are routed to all nodes.
2014-09-15 19:01:04 +03:00
Mark Riddoch
dc6db1d3d4 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-15 14:53:42 +01:00
MassimilianoPinto
4e88833d3e Fixed memory leak in getUsers bug 439
Fixed memory leak in getUsers bug 439
2014-09-15 15:53:09 +02:00
Mark Riddoch
d5e2410fe6 Fix for zero wieght in readconnrouter 2014-09-15 14:53:08 +01:00
Mark Riddoch
c8fc5b712b Merge branch 'hholzgra-hartmut-gitignore' into release-1.0beta-refresh 2014-09-15 13:22:46 +01:00
Mark Riddoch
3cd5013251 Merge branch 'hartmut-gitignore' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-gitignore 2014-09-15 13:21:56 +01:00
Markus Makela
8667bf27cb Fixed packaging problems 2014-09-15 14:52:47 +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
Markus Makela
48012cd571 Added more build options and README changes 2014-09-15 11:48:40 +03:00
Mark Riddoch
fb4f74ed61 Changed SPINLOCK_PROFILE back to #if so that defining SPINLOC_PROFILE 0 turns
off the profilign of spinlocks
2014-09-15 09:38:58 +01:00
VilhoRaatikka
bc320d1514 Cannot compile 2014-09-15 11:09:12 +03:00
VilhoRaatikka
c6384f2bcc Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-15 10:35:44 +03:00
VilhoRaatikka
c7bf6b66bf Fix to #492, http://bugs.skysql.com/show_bug.cgi?id=492
Added comments
2014-09-15 10:34:42 +03:00
Mark Riddoch
066b58afb0 Turn off spinlock profiling 2014-09-15 08:05:47 +01:00
Markus Makela
4c41dea6fb Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-15 09:43:24 +03:00
Markus Makela
0f07c9f08c Added hint tests
Fixed readwritesplit tests looking for test input in the wrong directory
Updated the canonical query test expected output
2014-09-15 09:27:47 +03:00
VilhoRaatikka
c2847c7ddb Clean up. 2014-09-14 10:17:09 +03:00
Markus Makela
5d26cf6fd5 Added optional RabbitMQ component configuration
Changed all the configuration variables to cached
Fixed some errors in tests
2014-09-14 07:33:21 +03:00
VilhoRaatikka
8e5d852dde Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-13 21:29:36 +03:00
VilhoRaatikka
2012dfdd35 Fix to bug #541, http://bugs.skysql.com/show_bug.cgi?id=541
Long ~0.5MB queries blocked MaxScale.
mysql_client.c:gw_read_client_event: Fixed packet reading logic. Reading didn't work when packet exceeded read buffer size.
mysql_common.c:gw_MySQL_get_next_packet: number of bytes to be copied to continuous buffer was calculated wrong, thus resulting in broken packet.
readwritesplit.c:disabled creation of canonical query in debug build because it slows down the processing too much with long queries
2014-09-13 21:16:44 +03:00