Commit Graph

2282 Commits

Author SHA1 Message Date
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
6fe8082445 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-09 10:20:25 +02: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
807adf5ed0 Merge from develop
Merge from develop
2015-09-07 14:49:50 +02:00
ad0becae48 Copyright set to 2015
Copyright set to 2015
2015-09-07 14:39:55 +02:00
4653830104 Develop merge
Develop merge
2015-09-07 11:13:49 +02:00
0febf23992 Removed LOGIF macros which prevented implicit initialization of the log manager. 2015-09-07 09:41:57 +03: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
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
47b8e661c7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-04 22:33:34 +02:00
d3cdaa4346 No need to process zombie victims if queue is empty. 2015-09-04 18:09:43 +01:00
a9fd7926ac Removed unnecessary strcmp. 2015-09-04 19:34:18 +03:00
9a3510ab56 Added maxinfo and binlogrouter to the list of "internal routers". 2015-09-04 19:30:14 +03:00
697e108072 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 18:58:06 +02:00
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
506bc422fb Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-03 10:08:55 +02:00
e55d345ab4 Added --version-full which prints version and commit ID. 2015-09-02 10:58:41 +03:00
b66dfaa8ec Fixed possible error with multi-line parameters. 2015-09-01 21:22:47 +03:00
77a49e8cbd Removed magic numbers. 2015-09-01 14:31:35 +03:00
e839dafdd0 Cleaned up code. 2015-09-01 14:31:35 +03:00
386fa78a30 Fix to MXS-342: https://mariadb.atlassian.net/browse/MXS-342
Added more error messaging when the parsing of the configuration file fails.
2015-09-01 14:31:35 +03:00
9d9b7bccfc Changed to PCRE for processing configuration file parameters. 2015-09-01 14:06:14 +03:00
e0f95de606 Added commas to multi-line parameters without one. 2015-09-01 14:06:14 +03:00
50d1675c7b Moved to realloc instead of always allocating new memory. 2015-09-01 14:06:14 +03:00
de643df067 All configuration parameters now support multi-line style. 2015-09-01 14:06:14 +03:00
72097fc30e Added support for multiline options for routers and filters. 2015-09-01 14:06:14 +03:00
d74990833b Move capture of user name for persistent connections; expand error message in mysql client to give more information. 2015-09-01 09:59:34 +01:00
9fe479e679 Cleaned up code. 2015-09-01 10:11:20 +03:00
28a6ea90c0 Added more details to log output when MaxScale receives a fatal signal. 2015-09-01 10:11:20 +03:00
a711b25fec Improve user name setting in DCB for persistent connections and to fix bug; change name of session_alloc_dummy to session_set_dummy to be more informative. 2015-08-28 18:20:32 +01:00
5338318900 Improve error message when DCB has no session pointer in poll loop. 2015-08-28 17:25:41 +01:00
753746f5c5 Fix mistakes 2015-08-28 16:12:36 +01:00
55248ec60e Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-28 16:42:15 +02:00
45227c8875 Changed service permission checks to fail when user doesn't have access rights. 2015-08-28 17:39:45 +03:00
00a3d7eb56 Made service permission checks less strict. 2015-08-28 17:33:05 +03:00
9c5f622481 Additional spinlock in random_jkiss. Initial attempt at implementing dummy sessions to provide total consistency - used in mysql_client in relation to authentication - a single static dummy session is used and linked from the client dcb when authentication is not yet complete. 2015-08-28 15:30:06 +01:00
a591b47b9f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-28 16:09:32 +02:00
3a901bfea7 Added automatic configuration of localhost_match_wildcard_host. 2015-08-28 14:55:40 +03:00
c5214bea1b Cleaned up code and changed function structure. 2015-08-28 12:54:38 +03:00
296bdc5df6 Fixed errors and added comments. 2015-08-28 12:54:38 +03:00
525daf827a Service are not started if user permissions are inadequate.
Also cleaned up code and error messages.
2015-08-28 12:54:38 +03:00
cb2b465510 Changed queries to more closely match actual queries. 2015-08-28 12:54:38 +03:00
b232c49742 Fixed function documentation. 2015-08-28 12:54:38 +03:00
4da9045da4 Removed redundant function. 2015-08-28 12:54:38 +03:00
94eb1b4eb1 Added service and monitor permission checks. 2015-08-28 12:51:37 +03:00
0d62f52812 Ensure thread safe through use of spinlock; add further comments. 2015-08-28 09:12:41 +01:00
0c552bab29 Fix to MXS-35: https://mariadb.atlassian.net/browse/MXS-35
The parent process now correctly returns the value from the child process.
2015-08-27 14:22:58 +03:00
c01aa6952e Fix initialisation problem; put all statements on separate lines. 2015-08-26 17:16:10 +01:00
57b82dcedb Correct initialisation logic. 2015-08-26 16:36:08 +01:00
70d82fd45e Fixed compilation problems. 2015-08-26 18:33:46 +03:00