fb3ba269db
Merge branch 'blr' into release-1.0beta-refresh
2014-09-25 17:08:30 +02: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
d793382006
Make "list monitors" output consistant with the output from other list
...
commands
2014-09-25 08:31:29 +01: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
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
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
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
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
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
a71971cf53
Make EPOLLRDHUP conditional to allow CentOS5 builds
2014-09-23 08:04:45 +01: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
d27522a6f9
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-22 11:12:14 +03:00
3d4dc48c8b
fixed double linking of the embedded library in a statically built internal library
2014-09-20 20:24:04 +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
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
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
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
c4fb3e490b
Bug 546 - use of weghtby causes entry in error log
2014-09-19 15:52:44 +01: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
2d2fc28b07
Addition of code to prevent multiple hangup's beign processed on the same
...
DCB
2014-09-19 11:40:16 +01:00
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
72550185ab
add 'rt' to test_filter libs list
2014-09-19 12:35:20 +03:00
3d030d0c7d
added missing test linker flags
2014-09-19 11:58:22 +03:00
c868fedb87
Fixed missing ${EMBEDDED_LIB} variables and changed to the proper template config file.
2014-09-19 11:41:44 +03:00
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
26e2695491
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-18 11:13:24 +03:00
7471911087
added missing debug compiler flags and tuned library linking flags
2014-09-18 11:05:40 +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
675baad4b1
Fixed typo
2014-09-17 14:54:40 +01:00
