Commit Graph

4208 Commits

Author SHA1 Message Date
f47b6324a1 Allman indentation style applied. 2015-10-21 14:54:19 +03:00
76f4f4fe89 Indentation and whitespace fixes.
Straightforward indentation and whitespace modifications.
This is the first one in a series of commits that will bring
log manager in line with the coding style.
2015-10-21 14:53:48 +03:00
add1927781 Reformatted to make line-length < 110. 2015-10-21 09:46:52 +03:00
04a1f9bd3d Error messages in getDatabases are now unique. 2015-10-20 22:45:29 +03:00
c795032358 Update Hint-Syntax.md
Added "s" to filters in example [Read Service] as it was confusing trying to get hint routing working correctly.
2015-10-20 10:48:11 -05:00
eeefd73623 Changed sprintf format to use %02hhx instead of %02x. 2015-10-20 16:20:54 +03:00
a8f866d372 Message log update
Message log update
2015-10-19 11:37:20 +02:00
75e8033052 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-10-19 09:36:04 +02:00
9b65e0b8b6 Fixed compiler warnings. 2015-10-14 10:58:32 +03:00
77f0128f8c Fixed HTML links referring to Markdown files instead of the generated HTML files. 2015-10-09 09:59:54 +03: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
7e1034a740 All conflicts are printed when processing databases. 2015-10-05 10:20:58 +03:00
6227d9f834 Cleaned up schemarouter code. 2015-10-05 10:20:58 +03:00
a576606f2b Updated schemarouter duplicate DB code based on code review. 2015-10-05 10:20:58 +03:00
af2bc91383 Cleaned up the clientReply function of the schemarouter. 2015-10-05 10:20:58 +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
62477c5760 Changed log message for trx_safe set to ON
Changed log message for trx_safe set to ON
2015-10-02 19:14:47 +02:00
78252fcb78 Message logs changed for slave request errors
Log messages changed for slave request errors
2015-10-02 18:30:19 +02:00
1e76de540f Added blr_distribute_error_message when distributing transaction events
Added blr_distribute_error_message when distributing transaction events
2015-10-02 09:46:52 +02:00
d31e081e45 Changed log messages for blr_read_binlog, added slave send error feaure
Changed log messages for blr_read_binlog, added slave send error feaure.

When blr_read_binlog detects an error an error message with 1236 code
is sent to the slave and it will stop the replication to binlogrouter
2015-10-01 17:03:48 +02:00
ceed5d1c45 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-10-01 10:38:50 +02:00
e043d204b4 blr_send_custom_error with errno and state
blr_send_custom_error with errno and state
2015-09-30 15:59:48 +02:00
680589ed46 Slave heartbeat period is reported in diagnostics
Slave heartbeat period is reported in diagnostics only if router option
is set
2015-09-30 15:21:18 +02:00
21509616e9 Fix routine argument type
Fix routine argument type
2015-09-30 14:47:48 +02:00
f9ee9ca028 Addition of send_slave_heartbeat option
Addition of send_slave_heartbeat option
2015-09-30 14:39:26 +02:00
4aa161d78e Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-30 14:20:39 +02:00
4d7629038d Fix to MXS-302: https://mariadb.atlassian.net/browse/MXS-302
Added support for additional command line parameters via sysconfig files.
2015-09-30 13:13:49 +03:00
dc4ded50dd Simplified the configuration file template. 2015-09-30 12:39:24 +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
447c3aa6c1 More code cleaning. 2015-09-29 12:03:21 +03:00
abab715a21 Simplified the code in parse_time. 2015-09-29 12:03:21 +03:00
f021d42820 Cleaned up the timerange string processing in dbfwfilter. 2015-09-29 12:03:21 +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
6f3ec723b1 Cleaned up Limitations 2015-09-29 10:23:04 +03:00
1fa5cfbeb7 Typo fixed
Typo fixed
2015-09-28 12:17:06 +02:00
d9a776d81a Added @@global.server_id and @@global.server_uuid
Added @@global.server_id and @@global.server_uuid
2015-09-28 12:12:26 +02:00
fcb13760fb Warnings treated as errors.
With all current warnings removed, warnings can now be treated as errors.
2015-09-28 10:27:43 +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
b6df52a68e Addition of slave heartbeat check
Addition of slave heartbeat check
2015-09-25 15:58:36 +02:00
df65ea0386 Fix to MXS-303: https://mariadb.atlassian.net/browse/MXS-303
Fixed package names.
2015-09-25 16:15:07 +03:00
490d9b3782 Fixed installation problems. 2015-09-25 16:15:07 +03:00
9efad8727a All warnings removed.
Minimal changes to remove warnings when compiling.
2015-09-25 14:07:19 +03:00
1e694a6c7d Debug messages logged to debug. 2015-09-25 13:49:30 +03:00
5864171207 Renamed 1.1.1 to 1.2.0 upgrading document to Upgrading-To-MaxScale-1.2.md 2015-09-25 13:19:53 +03:00
2f0ef4ad31 Configuration files from older installations no longer overwrite existing files. 2015-09-24 14:39:21 +03:00