7c582f91ea
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-11-02 18:09:59 +02:00
0d8faa6840
Invalid thread argument now results in shutdown.
...
This is done to avoid situations where the loaded configuration doesn't
match the contents of maxscale.cnf.
2015-11-02 12:00:08 +02:00
529e697eaf
Updated code based on review of ac308dcb2c34e081f9814ad40c0961a217c86fc4
...
Removed unnecessary spinlock and added more checks.
2015-11-02 12:00:08 +02:00
6810ed15dd
Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436
...
Added autodetection of processor cores and used it as the default if an
invalid value is used for threads.
2015-11-02 12:00:08 +02:00
3187f2c3f8
Updated code based on review of 9a04984
2015-10-31 10:34:37 +02:00
cd55f62051
Fix to MXS-29: https://mariadb.atlassian.net/browse/MXS-29
...
If MAXSCALE_SCHEMA.REPLICATION_HEARTBEAT isn't replicated, a warning is logged.
2015-10-31 10:34:37 +02:00
c1eb84b377
Added utility functions for regular expression matching with the PCRE2 library.
2015-10-31 10:34:37 +02:00
b543f36a49
Indentation and whitespace fixes.
...
There were many combinations of tab-width used so making the
indentation look right in the editor wasn't really possible.
The changes made:
- All tabs replaced with spaces.
- Indentation depth 4.
- , followed by space.
- Most binary operators (*, =, -) surrounded by one space.
- No space following ( or before ).
- Keywords follwed by 1 space.
2015-10-30 10:21:54 +02:00
1f22e2854b
maxscale_getline moved to config.c
...
As a general purpose function should be somewhere else, but we
need to sort out what should be where first.
2015-10-30 09:38:40 +02:00
5507624326
Fixed typo'd sizeof.
2015-10-29 18:19:05 +02:00
c29858d215
Added a definition for the size of the SSL error message buffer and changed all buffers to use it.
2015-10-29 16:39:38 +02:00
f819f164b5
Cleaned up dcb_accept_SSL and added missing logging.
2015-10-29 16:39:38 +02:00
cab5e58045
Fixed SSL initialization for services failing.
2015-10-29 16:39:38 +02:00
8d6c583a1c
Added a check for duplicate sections in the configuration file.
2015-10-29 16:11:08 +02:00
1dc48f5ed8
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-23 13:18:11 +02:00
04a1f9bd3d
Error messages in getDatabases are now unique.
2015-10-20 22:45:29 +03:00
75e8033052
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-19 09:36:04 +02:00
897907b202
Fix to MXS-352: https://mariadb.atlassian.net/browse/MXS-352
...
If a service fails, MaxScale will try to start it again later on.
2015-10-07 15:35:12 +03:00
bff6db96a1
Same database on more than one server now cause the schemarouter session to be closed.
2015-10-05 10:20:58 +03:00
56ed36ee76
Moved SSL initialization to be done before services are started.
2015-10-05 09:05:38 +03:00
4aa161d78e
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-30 14:20:39 +02: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
de1e1f4e28
In test-programs the ss...assert functions assert always.
...
Now handled by defining the relevant defines. Should be fixed
by replacing the use of ss_info_assert with test macros that
always assert.
Task for fixing this properly:
https://mariadb.atlassian.net/browse/MXS-382
2015-09-28 10:08:50 +03:00
69af0df6b5
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-28 08:48:27 +02:00
9efad8727a
All warnings removed.
...
Minimal changes to remove warnings when compiling.
2015-09-25 14:07:19 +03:00
653bb57e7f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-23 18:44:13 +02:00
3b19acd1de
Write queue emptied in dcb_final_free.
...
NOTE: Invalid indentation for reduced conflicts with MXS-329.
2015-09-23 15:16:19 +03:00
618a641b96
Reformatted user authentication queries as multi-line strings instead of one long string.
2015-09-23 08:00:58 +03:00
b6e37d6b6f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-09-22 08:40:03 +02:00
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
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
