Commit Graph

3968 Commits

Author SHA1 Message Date
f3560512ff Suppress call to router error handling where there is no router session. 2015-09-18 09:04:32 +01:00
c69658889c Handle client input case where no router session exists by sending error message to client. 2015-09-18 08:59:06 +01:00
d192cee0a1 Fixed Log message to 2015
Fixed Log message to 2015
2015-09-18 09:49:22 +02:00
31c6666278 Ensure DCB for closing session does not become persistent; remove bref_was_not_in_use. 2015-09-17 14:38:56 +01:00
dc3b0b067b Revert the dcb_close changes in handleError. 2015-09-17 13:35:18 +01:00
1ad8e27c91 Try a different arrangement of DCB closures in handleError of read-write split. 2015-09-17 13:27:25 +01:00
357c4bcae5 Add to or take from persistent pool only if server is running; add conditions to DCB close in read-write handleError to check backend reference was in use. 2015-09-17 12:53:59 +01:00
583c9b62fe Close DCB in handleError only if it can be found in a backend reference. 2015-09-17 11:58:19 +01:00
91dd3bb9bd Fix mistake. 2015-09-17 08:18:47 +01:00
0cba9b797f Changes to deal with failed session creation by keeping the new session in existence until all related DCBs have closed; minor changes in response to reviews. 2015-09-17 08:15:32 +01:00
11c75a1ee0 Merge branch 'dcb_ssl_refactoring' into develop 2015-09-17 07:22:23 +03:00
6ad89cb986 Removed boolean value assignment to an integer variable. 2015-09-16 13:36:33 +03:00
6c75e09f29 Fixed multi-source replication not working. 2015-09-16 11:54:56 +03:00
ea2c454010 Minor modification to documentation. 2015-09-16 11:19:20 +03:00
fe400e7041 Fixed service permission checks failing without SELECT privilege on mysql.db for the servuce user. 2015-09-16 11:10:24 +03:00
5aa882fc7e Made documentation cleaner. 2015-09-16 10:24:17 +03:00
fe9babe9ec Cleaned up code. 2015-09-16 10:22:29 +03:00
87b50ac337 Merge branch 'MXS-279' into develop 2015-09-16 10:01:21 +03:00
30239f395a Fix bref when backend server fails, error message if fails. 2015-09-15 20:07:56 +01:00
fdbe070e80 Change abort to error message when read connection router finds mismatch between router client session DCB and given backend DCB; improve order of actions when closing DCB in read-write router. 2015-09-15 15:22:44 +01:00
8a996029bc Merge branch 'MXS-35' into develop 2015-09-15 11:50:36 +03:00
bbc0116cd2 Moved the writing to and closing of the parent-child pipe to a separate function. 2015-09-15 10:52:37 +03:00
0cf4b2cf68 Fix to overcome failure on certain packets. 2015-09-15 08:37:41 +01:00
2829a8ce05 Added missing check for empty result set in binlogrouter. 2015-09-14 21:20:22 +03:00
e443351341 Fix to MXS-279: https://mariadb.atlassian.net/browse/MXS-279
Added NULL checks to block buffer initialization and checks for return values to functions that use it.
2015-09-14 16:29:14 +03:00
955974d06b Removed unused XID var
Removed unused XID var
2015-09-14 09:43:13 +02:00
5d1895561c Moved parts of dcb_read_SSL to separate functions. 2015-09-14 09:54:42 +03:00
c11c4733a4 Fixed wrong error message in dbusers 2015-09-12 05:43:32 +03:00
bb72b0c892 Fixed compiler warnings. 2015-09-12 04:46:47 +03:00
3b0b740e47 Fixed monitor scripts and added extra logging. 2015-09-11 18:49:20 +03:00
743fb5774b Improved logging. 2015-09-11 18:49:20 +03:00
37f8148574 MXS-362: Enable/disable log augmentation
Log message augmentation (appending of function name) can now
be enabled or disabled via the configuration file and command
line.

By default, the augmentation is disabled.
2015-09-11 15:58:31 +03:00
535523f9d7 Added an upper limit to trace log message length for queries. 2015-09-11 14:29:58 +03:00
9fda8dcc26 Changed link order.
Did not link on Ubuntu.
2015-09-11 13:57:24 +03:00
96fdb5eb8d Fixed SSL write failures not being handled properly. 2015-09-10 18:36:59 +03:00
c1194a5ee8 Fixed test build failures. 2015-09-10 18:07:24 +03:00
7d00a3670d Addition of maxbinlogcheck, a new utility in bin
Addition of maxbinlogcheck, a new utility in bin
2015-09-10 14:37:49 +02:00
cfeaf7d6e9 Merge remote-tracking branch 'origin/develop' into MXS-329
Conflicts:
	server/core/session.c
2015-09-10 13:07:27 +01:00
296e306daa Set session pointer to client dcb to null when dcb is closed. 2015-09-10 12:54:44 +01:00
9f01d0ec3f Fix type. 2015-09-10 10:54:33 +01:00
dd45a8f418 Updated documentation. 2015-09-09 16:23:07 +03:00
1bf8853046 Fix to MXS-339: https://mariadb.atlassian.net/browse/MXS-339
Renamed maxscale.cnf to maxscale.cnf.template
2015-09-09 13:21:54 +03:00
67f8520c38 Added missing include to sharding_common.h 2015-09-09 13:00:10 +03:00
f6916a23bd Move responsibility for closing DCB on error to router error handling. Check that routers remove or disable links to closed DCB. 2015-09-09 09:33:00 +01:00
b84dbd8d3f MXS-357: Possibility to turn off log message augmentation.
It's not always desireable to have the function name
appended to every logged line.
2015-09-09 10:59:22 +03:00
2e50dfd484 Readjust indentation in handleError function of read connection router. 2015-09-09 08:37:40 +01:00
986c918d52 Remove ERRACT_RESET action from router error handler; remove sole call from mysql_client. Correct comments on parameters for router error handlers. 2015-09-09 08:31:59 +01:00
5350a85e2b Fix to MXS-356: https://mariadb.atlassian.net/browse/MXS-356
Added configurable timeouts for the embedded MySQL connections.
2015-09-08 11:23:35 +03:00
ee19fbd41b Documentation Update
Documentation Update
2015-09-08 09:48:34 +02:00
6f481c5d62 Documentation Update
Documentation Update
2015-09-08 09:45:59 +02:00