Commit Graph

1825 Commits

Author SHA1 Message Date
06596a0bc3 Add binlog router back into Makefiles 2014-09-25 17:35:27 +01:00
fb3ba269db Merge branch 'blr' into release-1.0beta-refresh 2014-09-25 17:08:30 +02:00
d90c4d7d5a Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh 2014-09-25 16:00:59 +01:00
33636c06f8 MaxAdmin stress test 2014-09-25 16:00:18 +01:00
0d19857a1f Fix for debug build 2014-09-25 14:56:54 +01: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
2183dbcc28 Performance improvement 2014-09-25 12:00:19 +01:00
dff6fff888 Fixed missing return in process_pollq and added mysql.h to get rid of
warning about mysql_thread calls
2014-09-25 11:36:17 +01:00
3ac3a60229 Prevent epoll_wait call with a timeout if there are events in the queue to be processed 2014-09-25 11:10:30 +01:00
ba398157e8 Updated the normal makefile VERSION file 2014-09-25 12:39:14 +03:00
f5e789da2b init.d scripts and ldconfig files are no longer overwritten when configuring CMake 2014-09-25 12:37:04 +03:00
bff8c0f12f Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh 2014-09-25 10:42:52 +03:00
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
d793382006 Make "list monitors" output consistant with the output from other list
commands
2014-09-25 08:31:29 +01:00
25850c056f Added tests to cmake 2014-09-25 10:14:42 +03:00
d8d920bdb4 made the searching of MySQL headers look recursively for subdirectories 2014-09-24 18:58:23 +03: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
92ce8a47ba Introduction of a new polling mechanism to make the thread usage more fair and avoid
having busy DCB's being able to block execution of events on less busy DCBs
2014-09-24 16:34:34 +01:00
725a432bf7 Merging 'cmake_build' into 'release-1.0beta-refresh' 2014-09-24 17:29:23 +03:00
0b3b86ad1c Merge branch 'cmake_build' into merge_cmake 2014-09-24 17:16:10 +03:00
7d01fa1619 Reverting to an earlier version due to unforseen bugs in the new implementation 2014-09-24 17:12:55 +03:00
e30f4b4b95 Cleaned up dependency checking 2014-09-24 15:39:06 +03:00
a85c3fe97a Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 14:34:04 +03:00
e5ab9a2b9f changed the way MaxScale starts when testing. Now the test times out but the executable is surely started. 2014-09-24 14:31:30 +03:00
c4ee414117 Addition of test for show filter 2014-09-24 11:29:33 +01:00
48b1a77a27 Fix for message length in COM_QUERY 2014-09-24 11:15:33 +01: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
9c61dcebaa changed 'Release' build type to 'Optimized' and removed the default -O2 flags 2014-09-24 12:58:44 +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
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
0e23979609 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 12:27:20 +03:00
1cf3fa367c test executable now works 2014-09-24 12:25:53 +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
4d6bcdbfc1 Merge branch 'release-1.0beta-refresh' into query_classifier_test 2014-09-24 09:58:30 +03:00
0b143584c6 Added comments and removed redundant dependency checking 2014-09-24 09:57:17 +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
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
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
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
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
b78082f8f1 Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-23 10:42:47 +03:00
a71971cf53 Make EPOLLRDHUP conditional to allow CentOS5 builds 2014-09-23 08:04:45 +01:00