hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,685 Commits 1 Branch 0 Tags
Commit Graph

901 Commits

Author SHA1 Message Date
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
Markus Makela
f4e591e382 Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale' 2014-09-30 13:15:03 +03:00
Markus Makela
dd8662cb77 Renaming of the header licenses 2014-09-30 13:04:51 +03:00
Markus Makela
c344231f80 Renamed all occurences of SkySQL to MariaDB Corporation 2014-09-30 13:02:10 +03:00
Markus Makela
dd5c3c1d0f Removal of binlog router from Makefile 2014-09-26 18:13:30 +03:00
MassimilianoPinto
778877219c SPINLOCK_PROFILE set 0 
SPINLOCK_PROFILE set 0
 2014-09-26 17:04:40 +02: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
fb3ba269db Merge branch 'blr' into release-1.0beta-refresh 2014-09-25 17:08:30 +02:00
Mark Riddoch
0d19857a1f Fix for debug build 2014-09-25 14:56:54 +01:00
Mark Riddoch
2183dbcc28 Performance improvement 2014-09-25 12:00:19 +01:00
Mark Riddoch
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
Mark Riddoch
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
Mark Riddoch
d793382006 Make "list monitors" output consistant with the output from other list 
commands
 2014-09-25 08:31:29 +01: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
Mark Riddoch
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
Markus Makela
725a432bf7 Merging 'cmake_build' into 'release-1.0beta-refresh' 2014-09-24 17:29:23 +03:00
Markus Makela
a85c3fe97a Merge branch 'release-1.0beta-refresh' into cmake_build 2014-09-24 14:34:04 +03:00
Markus Makela
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
Mark Riddoch
48b1a77a27 Fix for message length in COM_QUERY 2014-09-24 11:15:33 +01: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
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
Mark Riddoch
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
VilhoRaatikka
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
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
Mark Riddoch
a71971cf53 Make EPOLLRDHUP conditional to allow CentOS5 builds 2014-09-23 08:04:45 +01: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
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
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
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