MassimilianoPinto
b6e37d6b6f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-22 08:40:03 +02:00
counterpoint
15f042f083
On reflection, freeing keys and values in hashtable processing is not a good idea because we don't know what they are, and can put up with some small memory losses.
2015-09-21 15:49:57 +01:00
Markus Makela
338b870cd1
Fix to MXS-373: https://mariadb.atlassian.net/browse/MXS-373
...
The log manager is initialized only once and skygw_log_sync_all now checks if the log manager has been successfully started before interacting with the log manager
2015-09-21 17:27:49 +03:00
counterpoint
7aa36b77ea
Guarantee router session is present for call to clientReply; properly free callbacks; attempt to set all necessary values for dbusers; do more to ensure buffers freed.
2015-09-21 14:25:12 +01:00
counterpoint
88716c35fb
Various changes to block loopholes in different cases and tidy up.
2015-09-21 09:23:22 +01:00
MassimilianoPinto
26b0ff8e77
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-21 09:03:13 +02:00
Markus Makela
601eac5a5d
Fixed parent-child code being called in non-daemon mode.
2015-09-18 17:26:27 +03:00
MassimilianoPinto
4e3ef93fe5
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-18 15:28:08 +02:00
MassimilianoPinto
67c9f30632
Added missing NULL byte for resource
...
Added missing NULL byte for resource
2015-09-18 15:27:36 +02:00
counterpoint
b8af047a25
Remove excessively tight conditions for selecting persistent connections, add more information to debug output when connection is rejected.
2015-09-18 11:03:23 +01:00
MassimilianoPinto
58e5168286
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-18 09:50:04 +02:00
MassimilianoPinto
d192cee0a1
Fixed Log message to 2015
...
Fixed Log message to 2015
2015-09-18 09:49:22 +02:00
Martin Brampton
31c6666278
Ensure DCB for closing session does not become persistent; remove bref_was_not_in_use.
2015-09-17 14:38:56 +01:00
Martin Brampton
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
MassimilianoPinto
e725c86c7d
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-17 10:50:10 +02:00
Martin Brampton
91dd3bb9bd
Fix mistake.
2015-09-17 08:18:47 +01:00
Martin Brampton
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
Markus Makela
11c75a1ee0
Merge branch 'dcb_ssl_refactoring' into develop
2015-09-17 07:22:23 +03:00
MassimilianoPinto
11c4a1a491
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-16 19:09:08 +02:00
Markus Makela
fe400e7041
Fixed service permission checks failing without SELECT privilege on mysql.db for the servuce user.
2015-09-16 11:10:24 +03:00
Markus Makela
fe9babe9ec
Cleaned up code.
2015-09-16 10:22:29 +03:00
MassimilianoPinto
a2d91678c7
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-15 15:17:20 +02:00
Markus Makela
8a996029bc
Merge branch 'MXS-35' into develop
2015-09-15 11:50:36 +03:00
Markus Makela
bbc0116cd2
Moved the writing to and closing of the parent-child pipe to a separate function.
2015-09-15 10:52:37 +03:00
MassimilianoPinto
c2c27d7cca
Merge from develop
...
Merge from develop
2015-09-14 09:49:33 +02:00
Markus Makela
5d1895561c
Moved parts of dcb_read_SSL to separate functions.
2015-09-14 09:54:42 +03:00
Markus Makela
c11c4733a4
Fixed wrong error message in dbusers
2015-09-12 05:43:32 +03:00
Markus Makela
3b0b740e47
Fixed monitor scripts and added extra logging.
2015-09-11 18:49:20 +03:00
MassimilianoPinto
3fe317f69b
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-11 15:22:17 +02:00
Johan Wikman
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
Markus Makela
96fdb5eb8d
Fixed SSL write failures not being handled properly.
2015-09-10 18:36:59 +03:00
Markus Makela
c1194a5ee8
Fixed test build failures.
2015-09-10 18:07:24 +03:00
counterpoint
cfeaf7d6e9
Merge remote-tracking branch 'origin/develop' into MXS-329
...
Conflicts:
server/core/session.c
2015-09-10 13:07:27 +01:00
counterpoint
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
MassimilianoPinto
6fe8082445
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-09 10:20:25 +02:00
Markus Makela
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
MassimilianoPinto
807adf5ed0
Merge from develop
...
Merge from develop
2015-09-07 14:49:50 +02:00
MassimilianoPinto
ad0becae48
Copyright set to 2015
...
Copyright set to 2015
2015-09-07 14:39:55 +02:00
MassimilianoPinto
4653830104
Develop merge
...
Develop merge
2015-09-07 11:13:49 +02:00
Markus Makela
0febf23992
Removed LOGIF macros which prevented implicit initialization of the log manager.
2015-09-07 09:41:57 +03:00
Johan Wikman
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
Martin Brampton
42c9532a56
Simplify logic and reverse list to kill, so as to cancel out the reversal in the original zombie list. Probably not significant, but might be helpful.
2015-09-05 00:32:29 +01:00
MassimilianoPinto
47b8e661c7
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-04 22:33:34 +02:00
counterpoint
d3cdaa4346
No need to process zombie victims if queue is empty.
2015-09-04 18:09:43 +01:00
Markus Makela
a9fd7926ac
Removed unnecessary strcmp.
2015-09-04 19:34:18 +03:00
Markus Makela
9a3510ab56
Added maxinfo and binlogrouter to the list of "internal routers".
2015-09-04 19:30:14 +03:00
MassimilianoPinto
697e108072
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-03 18:58:06 +02:00
Markus Makela
30cdda48c6
The datadir path is now used as the location where the process specific data directories are created.
2015-09-03 19:30:16 +03:00
MassimilianoPinto
506bc422fb
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-03 10:08:55 +02:00
Markus Makela
e55d345ab4
Added --version-full which prints version and commit ID.
2015-09-02 10:58:41 +03:00
