Markus Makela
52c0d0c768
Merge remote-tracking branch 'origin/develop' into header_rename
2014-10-01 05:24:02 +03:00
VilhoRaatikka
ca7ae0bb64
Fix to bug #557 , http://bugs.mariadb.com/show_bug.cgi?id=557
...
query_classifier.cc: added function for printing combined query type from a bit field.
query_classifier.h: identify query types SHOW DATABASE, and SHOW TABLES to make log entries more understandable.
mysql_common.c: moved some trace log commands to debug log.
readwritesplit.c: moved some trace logs to debug log, added trace log commands to gather routing, query type and session information to one log entry.
skygw_debug.h: added string macros for several query and hint types.
2014-09-30 16:31:30 +03:00
Mark Riddoch
bce0716861
Merge branch 'blr' of https://github.com/skysql/MaxScale into blr
2014-09-30 13:27:03 +01:00
Mark Riddoch
0ef87e3cc1
Updates to slave catchup mode to use fake events
...
Addition of fake EPOLLOUT event mechanism
New memlog feature for debugging purposes
2014-09-30 13:25:45 +01:00
MassimilianoPinto
c3dd8d973a
Code cleanup
...
Code cleanup
2014-09-30 13:19:03 +02:00
Markus Makela
f4e591e382
Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'
2014-09-30 13:15:03 +03:00
Markus Makela
c344231f80
Renamed all occurences of SkySQL to MariaDB Corporation
2014-09-30 13:02:10 +03:00
MassimilianoPinto
5f6d04e7db
Match for Class C,B,A in hosts with %
...
Match for Class C,B,A in hosts with %
2014-09-29 16:50:21 +02:00
MassimilianoPinto
76320c056b
Match Class C,B,A addresses
...
Match Class C,B,A addresses
2014-09-29 12:08:10 +02:00
MassimilianoPinto
1d14129edf
Merge branch 'develop' into MAX-268
2014-09-29 09:51:57 +02:00
Markus Makela
dd5c3c1d0f
Removal of binlog router from Makefile
2014-09-26 18:13:30 +03:00
VilhoRaatikka
2801aa851e
Merge branch 'blr' of https://github.com/skysql/MaxScale into blr
2014-09-26 15:44:18 +03:00
VilhoRaatikka
5ec1a83f3b
Fix to #478 , http://bugs.skysql.com/show_bug.cgi?id=478
...
Execution of session commands failed because session commands and normal sql statements were executed in a wrong order if backend was executing previous session command while new sql stmt was routed to that backend. There was a window where ordering went wrong.
It is possible that one normal sql stmt arrives while previous sescmds are still being executed.
Introduced a new member in backend_ref_t structure, bref_pending_cmd where new sql stmt pointer is stored in that case. When sescmds are executed completely, that command is automatically executed next.
2014-09-26 15:40:32 +03:00
Mark Riddoch
3430fc99d2
Shutdown fix in housekeeper
...
In memory logging in blr_master
2014-09-26 12:36:59 +01:00
Mark Riddoch
06596a0bc3
Add binlog router back into Makefiles
2014-09-25 17:35:27 +01:00
Markus Makela
5bef5d8f53
Removed binlogrouter from the build process.
2014-09-25 21:25:46 +03:00
MassimilianoPinto
3fdfc5db8d
Code cleanup
...
Code cleanup
2014-09-25 13:13:52 +02:00
MassimilianoPinto
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
Mark Riddoch
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
Markus Makela
a85c3fe97a
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-24 14:34:04 +03:00
Mark Riddoch
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
Mark Riddoch
f3429dac1b
Fix for double free if incorrect password is passed
2014-09-24 11:13:33 +01:00
Markus Makela
99cf637e03
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-24 12:59:47 +03:00
VilhoRaatikka
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
VilhoRaatikka
fd95acdcbf
Monitor checks weren't done if interval%100<100. Fixed.
2014-09-24 12:54:07 +03:00
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
4743b2e5bf
Merge branch 'release-1.0beta-refresh' into filter_harness
2014-09-24 09:26:20 +03:00
Markus Makela
eae2c03924
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-24 09:25:50 +03:00
Mark Riddoch
7562d49a95
Addition rtdsc for tracing purposes
2014-09-23 22:09:36 +01: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
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
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
d561ccb089
Merge branch 'release-1.0beta-refresh' into blr
2014-09-19 13:42:37 +01:00
Mark Riddoch
5721df5176
Add initial file number
...
Fix for short binlog file names in rotate
Socket buffering changes
2014-09-19 13:40:38 +01: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
Markus Makela
26e2695491
Merge branch 'release-1.0beta-refresh' into cmake_build
2014-09-18 11:13:24 +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
Markus Makela
530d29f96d
Merge branch 'release-1.0beta-refresh' into filter_harness
2014-09-17 11:07:12 +03: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
3acc2711d6
Merge branch 'release-1.0beta-refresh' into blr
2014-09-16 16:55:47 +01: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
Mark Riddoch
c642af7891
Add binlogrouter back into Makefile following merge
2014-09-16 14:28:47 +01: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