Commit Graph

835 Commits

Author SHA1 Message Date
1b04a0cf91 Fix issues with error handling needing to cater for both client and backend DCBs. 2015-11-02 16:27:44 +00:00
bad61b0740 Change binlog router to indicate it does not use router sessions via the getCapabilities interface. 2015-10-27 14:17:06 +00:00
06f6b28048 Fix to MXS-412: https://mariadb.atlassian.net/browse/MXS-412
service->user is now set to NULL after the users are freed.
2015-10-19 09:01:58 +03:00
5112d4118f Fix to MXS-409: https://mariadb.atlassian.net/browse/MXS-409
Prepared statements are sent to the master instead of all servers.

The planned functionality to store the types of the prepared statements was not implemented
and all executions of prepared statements are sent to the master. Because of this the preparations
should be all sent to the master server instead of sending them to all servers.
2015-10-19 09:01:58 +03:00
e38ea9d07d Correct missing return value. 2015-10-02 16:19:59 +01:00
4f316419c5 Merge branch 'develop' into MXS-329 2015-09-30 12:47:28 +03:00
48fd181245 Merge branch 'test_fix_1.3' into develop 2015-09-30 08:34:02 +03:00
638c2250c9 Fixed internal test suite. 2015-09-29 16:36:12 +03:00
d679bf1cd8 Fix to MXS-389: https://mariadb.atlassian.net/browse/MXS-389
Utility tools now use static log manager.
2015-09-29 14:56:05 +03:00
96f76a1f2e Changed the way max_sescmd_history works and combined disable_sescmd_history and disable_slave_recovery.
Before these changes when max_sescmd_history was used the session
was closed when the limit was exceeded. With this change, when the
limit is exceeded the recovery of slaves and the session command history
are both disabled. This will allow the sessions to continue while still
keeping the old functionality of limited salve replacement.

The disable_sescmd_history and disable_slave_recovery parameters were combined
so that disabling the session command history will also disable slave recovery.
This way no harm can be done with disable_sescmd_history.
2015-09-29 12:03:22 +03:00
db0e2e881f Double free prevented.
routeQuery calls route_single_stmt, which requires the GWBUF to be
contiguous. Earlier it was made contiguous (if needed) in
route_single_stmt. However, since the process of making a GWBUF
contiguous causes the original buffer to be freed, this would lead
to a double free later in routeQuery that frees the passed buffer.

This is prevented now by making the buffer contiguous before calling
route_single_stmt.
2015-09-29 10:57:45 +03:00
2231d0870c Place checks in callback routines because DCB will not always contain a reference to a router session, and the associated data will be invalid in this case. 2015-09-25 12:17:18 +01:00
2dfb9e3c11 Merge branch 'develop' into MXS-329 2015-09-24 17:59:36 +03:00
f7946a05fa Fix in extract_message
Fix in extract_message
2015-09-23 14:05:02 +02:00
561891aac5 Fix for double free, possible fix for bug601.
In the end of execute_sescmd_in_backend the buffer was consumed
in case the protocol function failed. Or actually if it returned
something else but 1.

In the case of mysql_backend, the buffer is always freed when
authorizing and either consumed or placed on the dcb writequeue
when the data is written.

That is, it is never ok to consume the buffer in this function.
The end-result is likely to be an abort.
2015-09-21 13:45:15 +03:00
88716c35fb Various changes to block loopholes in different cases and tidy up. 2015-09-21 09:23:22 +01:00
de8e54da8b Fix for compile error
Fix for compile error
2015-09-21 09:00:39 +02:00
2c12ba3d16 Various fixes
Various fixes for initialisation and packet size allocation
2015-09-21 09:00:20 +02:00
8d5ca11374 Fixed: spinlock_release is before free
Fixed: spinlock_release is before free
2015-09-18 16:05:22 +02:00
2a2582067a Added fix blr_slave_register reply
Added fix blr_slave_register reply
2015-09-18 11:06:03 +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
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
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
955974d06b Removed unused XID var
Removed unused XID var
2015-09-14 09:43:13 +02:00
bb72b0c892 Fixed compiler warnings. 2015-09-12 04:46:47 +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
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
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
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
160bbb70ee MXS-251: strerror
Replaces all calls to strerror with calls to strerror_r. The former
is non-thread safe while the latter is.
2015-09-05 15:52:13 +03:00
4a1ad3df69 Attempt solution to crash caused by leaving link to backend DCB in router session. 2015-09-05 08:53:19 +01:00
70a7a5f2f6 Fix to MXS-328: https://mariadb.atlassian.net/browse/MXS-328
Removed gwbuf_free when the write fails.
2015-08-27 09:16:00 +03:00
b3be72022c Fixed use_sql_variables_in=master not working. 2015-08-25 21:53:54 +03:00
1731a90fad Fix for lastEventTimestamp localtime
Fix for lastEventTimestamp localtime computation
2015-08-25 11:37:17 +02:00
37ac158791 Changes to try to eliminate setting dcb->session to NULL with risk of crashing system. 2015-08-24 12:12:43 +01:00
799844e243 Fixed MXS-111 https://mariadb.atlassian.net/browse/MXS-111
Fixed MXS-111 https://mariadb.atlassian.net/browse/MXS-111
2015-08-24 10:52:26 +02:00
5adae0ff3b Added missing return value. 2015-08-23 20:46:16 +03:00
f014598d39 Added NULL checks. 2015-08-21 17:42:03 +03:00
8a362d6668 Fixed memory leaks in maxinfo.c and httpd.c 2015-08-21 08:08:45 +03:00
9a6e3a9a86 Fix to Coverity defect. 2015-08-20 09:34:52 +03:00
895989446d MXS-224: Added SQL commands to the log message at slave disconnect time
MXS-224: Added SQL commands to the log message at slave disconnect time
2015-08-19 12:04:15 +02:00