Commit Graph

836 Commits

Author SHA1 Message Date
5bef5d8f53 Removed binlogrouter from the build process. 2014-09-25 21:25:46 +03:00
3fdfc5db8d Code cleanup
Code cleanup
2014-09-25 13:13:52 +02:00
717f24ce48 Added first support for user@x.y.z.%
Added first support for user@x.y.z.%
2014-09-25 13:08:12 +02:00
63252e94f2 Merge branch 'release-1.0beta-refresh' into blr
Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c
2014-09-24 16:49:12 +01:00
a85c3fe97a Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 14:34:04 +03:00
7da4aa1400 Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-24 11:14:10 +01:00
f3429dac1b Fix for double free if incorrect password is passed 2014-09-24 11:13:33 +01:00
99cf637e03 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:59:47 +03:00
315b5b92df Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-24 12:55:19 +03:00
fd95acdcbf Monitor checks weren't done if interval%100<100. Fixed. 2014-09-24 12:54:07 +03:00
0e23979609 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:27:20 +03:00
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
e8b5c2cbdf Updates to maxadmin to prevent hang when maxscale shuts down
Addition of maxadmin test script
2014-09-24 10:04:36 +01:00
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
4743b2e5bf Merge branch 'release-1.0beta-refresh' into filter_harness 2014-09-24 09:26:20 +03:00
eae2c03924 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 09:25:50 +03:00
7562d49a95 Addition rtdsc for tracing purposes 2014-09-23 22:09:36 +01:00
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
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
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
d561ccb089 Merge branch 'release-1.0beta-refresh' into blr 2014-09-19 13:42:37 +01:00
5721df5176 Add initial file number
Fix for short binlog file names in rotate

Socket buffering changes
2014-09-19 13:40:38 +01:00
c868fedb87 Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file. 2014-09-19 11:41:44 +03:00
26e2695491 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-18 11:13:24 +03:00
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
530d29f96d Merge branch 'release-1.0beta-refresh' into filter_harness 2014-09-17 11:07:12 +03:00
3776fdb015 added a 'testall' target which builds and runs the tests 2014-09-17 10:39:47 +03:00
8b1afbfe26 fixed tests not working with the normal 'make testall' 2014-09-16 20:02:28 +03:00
3acc2711d6 Merge branch 'release-1.0beta-refresh' into blr 2014-09-16 16:55:47 +01:00
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
a5ba0457d0 Merge remote-tracking branch 'origin/release-1.0beta-refresh' into cmake_build 2014-09-16 17:36:35 +03:00
c642af7891 Add binlogrouter back into Makefile following merge 2014-09-16 14:28:47 +01:00
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
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
41226692ac Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-16 12:11:17 +03:00
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
fdf1271138 Cleaned up RabbitMQ component building. 2014-09-16 11:34:05 +03:00
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
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
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
d5e2410fe6 Fix for zero wieght in readconnrouter 2014-09-15 14:53:08 +01:00
c8fc5b712b Merge branch 'hholzgra-hartmut-gitignore' into release-1.0beta-refresh 2014-09-15 13:22:46 +01:00
3cd5013251 Merge branch 'hartmut-gitignore' of https://github.com/hholzgra/MaxScale into hholzgra-hartmut-gitignore 2014-09-15 13:21:56 +01: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
4c41dea6fb Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-15 09:43:24 +03:00
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
c2847c7ddb Clean up. 2014-09-14 10:17:09 +03:00
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
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