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

3027 Commits

Author SHA1 Message Date
Markus Makela
ba32596603 Fixed MM monitor segfault on crash. 2015-08-07 14:00:55 +03:00
root
61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router 
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c
 2015-08-04 07:59:44 -04:00
Markus Makela
a6ae1cbc22 Fixed session timeouts using func.hangup instead of dcb_close. 2015-08-03 08:34:25 +03:00
counterpoint
6a92a419ff Remove function declaration - moved to header. Implement spin_reporter in server.c, required for correct compilation when SPINLOCK_PROFILE is defined true. 2015-07-27 09:01:20 +01:00
Markus Makela
66445c838b Fixed missing include 2015-07-24 16:48:45 +03:00
Markus Makela
e5502271ae Merge branch 'sigchld_handler' into develop 2015-07-24 13:42:52 +03:00
Markus Makela
e252402edf Fixed config failure when listener only has a socket and no port. 2015-07-24 12:47:28 +03:00
Markus Makela
adee076242 Merge branch 'develop' into sigchld_handler 2015-07-24 12:25:26 +03:00
Markus Makela
dcd82d3a33 Fixed errors and added logging. 2015-07-24 12:19:22 +03:00
Markus Makela
90b20a7459 Converted dcb_free calls to dcb_close in service.c. 2015-07-24 12:06:30 +03:00
Markus Makela
998ef6c949 Added SIGCHLD handler. 2015-07-24 12:05:09 +03:00
Markus Makela
7363343499 Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK. 2015-07-22 15:34:51 +03:00
counterpoint
78e046c9f8 Fix typo; fix double count decrement. 2015-07-21 11:00:47 +01:00
counterpoint
c33f1199d9 Fix lack of declaration for session_unlink_dcb; restructure dcb closedown logic to fix counting problem and reduce code. 2015-07-21 09:54:01 +01:00
Markus Makela
3c999cef8d Added missing subtraction of current number of connections. 2015-07-20 16:39:37 +03:00
Markus Makela
a53c91c587 Fixed compiler warnings. 2015-07-20 16:29:36 +03:00
counterpoint
89524b1427 Further tidying in dcb_write 2015-07-20 14:19:00 +01:00
Martin Brampton
bb1f26eda5 Fixes for maintainability of dcb.c; error in persistent connections. 2015-07-19 16:48:24 +01:00
counterpoint
4a0925f33d Correct mistake in dcb_read; use larger integer to accomodate three byte length in modutil. 2015-07-19 09:10:48 +01:00
Markus Makela
a85262171f Added missing assignment of the write buffer to write queue when a write fails in dcb_write. 2015-07-16 21:47:42 +03:00
counterpoint
d4bc710d3e Fix mistake in dcb_close. 2015-07-15 15:15:28 +01:00
Markus Makela
0a43b9eebf Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-15 15:00:35 +03:00
Markus Makela
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
counterpoint
260f829046 Add blank line to start of Document Contents (link otherwise not rendered correctly by web site); move upgrade documents into their own directory; modify poll.c to fix problem relating to cloned DCBs. 2015-07-15 08:35:50 +01:00
Markus Makela
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
Markus Makela
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
Markus Makela
ad369f61c6 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +03:00
Markus Makela
a1801237a8 Fixed error messages being printed for existing directories. 2015-07-13 19:35:38 +03:00
MassimilianoPinto
9480c01b96 New log messages for dbusers loading failure 
New log messages for dbusers loading failure
 2015-07-13 18:12:34 +02:00
counterpoint
3ddbe47f8b Minor tidy up, including removing obsolete MUTEX_BLOCK. 2015-07-13 14:32:54 +01:00
Markus Makela
0134fdc397 Merge branch 'release-1.2' into develop 
Conflicts:
	server/core/dbusers.c
 2015-07-13 15:52:36 +03:00
Markus Makela
93e557d8be Merge branch 'release-1.2' into MXS-230 2015-07-13 13:27:11 +03:00
Markus Makela
584ad321ff Fixed possible crash. 2015-07-13 13:22:19 +03:00
Markus Makela
ef6728344e Fixed failures to close cloned DCBs. 2015-07-13 13:11:43 +03:00
Markus Makela
056ad50458 Merge branch 'release-1.2' into MXS-230 2015-07-13 13:08:37 +03:00
counterpoint
00b4d8edf5 Tidy up indentation, add folds around logging, in dcb_read. 2015-07-13 09:56:29 +01:00
Markus Makela
a9d30b07b3 Fixed MXS-258: https://mariadb.atlassian.net/browse/MXS-258 2015-07-12 22:34:28 +03:00
Markus Makela
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
Markus Makela
6497350ab7 Merge branch 'release-1.2' into develop 
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
 2015-07-11 17:12:48 +03:00
Markus Makela
f095ec353c Fixed config file being installed into /usr/etc instead of /etc. 2015-07-10 21:31:33 +03:00
Markus Makela
2fe6d837fc Added null checks to hashtable functions and fixed possible crash with reload users. 2015-07-10 20:38:10 +03:00
counterpoint
ce0d9684d4 A few more clarifications, I hope. 2015-07-10 17:00:48 +01:00
counterpoint
4f5de063eb Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter). 2015-07-10 15:12:22 +01:00
counterpoint
015cb890d4 Reduce complexity. 2015-07-10 14:56:01 +01:00
counterpoint
8376bbf3e6 Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location. 2015-07-09 08:37:20 +01:00
counterpoint
bccf3d27d6 Correct name of function in debug message. 2015-07-08 16:22:09 +01:00
counterpoint
700576ac32 Add the DCB address to the "Not adding DCB to persistent pool" debug message. 2015-07-08 16:15:19 +01:00
counterpoint
ce879b65c2 Fix wrong debug message; add maxadmin info for actual max size of persistent pool. 2015-07-08 16:03:50 +01:00
counterpoint
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122 
Conflicts:
	server/core/dcb.c
 2015-07-08 14:54:22 +01:00
counterpoint
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00