26b0ff8e77
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-21 09:03:13 +02:00
601eac5a5d
Fixed parent-child code being called in non-daemon mode.
2015-09-18 17:26:27 +03:00
4e3ef93fe5
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-18 15:28:08 +02:00
67c9f30632
Added missing NULL byte for resource
...
Added missing NULL byte for resource
2015-09-18 15:27:36 +02:00
58e5168286
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-18 09:50:04 +02:00
d192cee0a1
Fixed Log message to 2015
...
Fixed Log message to 2015
2015-09-18 09:49:22 +02:00
e725c86c7d
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-17 10:50:10 +02:00
11c75a1ee0
Merge branch 'dcb_ssl_refactoring' into develop
2015-09-17 07:22:23 +03:00
11c4a1a491
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-16 19:09:08 +02: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
fe9babe9ec
Cleaned up code.
2015-09-16 10:22:29 +03:00
a2d91678c7
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-15 15:17:20 +02: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
c2c27d7cca
Merge from develop
...
Merge from develop
2015-09-14 09:49:33 +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
3b0b740e47
Fixed monitor scripts and added extra logging.
2015-09-11 18:49:20 +03:00
3fe317f69b
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-11 15:22:17 +02: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
96fdb5eb8d
Fixed SSL write failures not being handled properly.
2015-09-10 18:36:59 +03: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
47b8e661c7
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-04 22:33:34 +02: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
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
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
a591b47b9f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-08-28 16:09:32 +02:00
