dee20fe077
Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
...
# Conflicts:
# server/core/CMakeLists.txt
# server/core/buffer.c
# server/core/service.c
# server/modules/filter/tee.c
# server/modules/monitor/mysql_mon.c
# server/modules/routing/binlog/blr.c
# server/modules/routing/binlog/blr_slave.c
# server/modules/routing/debugcmd.c
# server/modules/routing/readwritesplit/readwritesplit.c
# utils/skygw_utils.cc
- resolved.
2015-11-11 11:08:02 +00:00
23b3c9d2b2
Log message removed
...
Log message removed
2015-11-09 11:53:27 +01:00
e7dbc605af
Spinlock added for slave state set
...
Spinlock added for slave state set
2015-11-09 09:59:36 +01:00
5e71ff093f
Log message updates
...
Log message updates
2015-11-06 18:28:41 +01:00
00c506b029
Fix for rotate and catchup with transaction_safety = 1
...
Fix for rotate and catchup with transaction_safety = 1
2015-11-06 18:14:52 +01:00
450078fa92
Interface of skygw_logmanager_init(int argc, char* argv[]) changed.
...
The previous interface of skygw_logmanager_init was conceptually
broken. With -o you could specify that logging should be done to
stdout. However, even if you did that, the log manager still checked
that the logging directory could be accessed. Unless it had been
specified using -j <path> the default was /var/log/maxscale.
That is, unless the program calling skygw_logmanager_init was invoked
by a user that had write access to /var/log/maxscale, there would be
a complaint even if nothing was ever written to that directory.
In practice this meant that even if -o was used you had to provide
a -j with a path that surely is writeable (e.g. "/tmp").
This has now been changed so that you explicitly must provide the
log directory and the flags -j and -o are removed.
bool skygw_logmanager_init(const char* logdir, int argc, char* argv[]);
If /logdir/ is provided then logged messages are written to a log file
in that directory. If /logdir/ is NULL then messages are logged to stdout
and no checks for access to any directory is not made.
2015-11-06 14:20:05 +02:00
e8c1c82265
Removed failed fstat message
...
Removed failed fstat message
2015-11-04 17:54:41 +01:00
c37b33c60e
Merge branch '1.2.1-binlog_router_trx' into develop
2015-11-04 16:42:30 +01:00
685e674009
Log message update
...
Log message update
2015-11-04 16:41:27 +01:00
d51ac7ab7d
Disconnect slave when pos is UNSAFE
...
Disconnect slave when pos is UNSAFE instead of sending an error that
stops the replication
2015-11-04 16:24:46 +01:00
834a88aeda
Log variables moved to log_manager.h
...
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
2594c83117
Missing format specified added.
2015-11-03 14:21:20 +02:00
99720ffa9f
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-28 10:15:52 +01:00
3c30827f16
Report blr_print_binlog_details only if pos > 4
...
Report blr_print_binlog_details only if pos > 4
2015-10-28 10:15:05 +01:00
d7d009f3b3
Merge from develop
...
Merge from develop
2015-10-28 09:38:31 +01:00
a718c995ae
Added blr_print_binlog_details
...
Added blr_print_binlog_details
2015-10-27 17:33:15 +01:00
bad61b0740
Change binlog router to indicate it does not use router sessions via the getCapabilities interface.
2015-10-27 14:17:06 +00:00
a066b34e8e
Fix for change master to new binlog file
...
Fix for change master to new binlog file
2015-10-26 10:35:33 +01:00
8208f3a728
strerror_r update
...
strerror_r update
2015-10-23 18:44:39 +02:00
4b923ce4bc
Merge branch '1.2.1-binlog_router_trx' of https://github.com/mariadb-corporation/MaxScale into 1.2.1-binlog_router_trx
2015-10-23 16:44:21 +03:00
bf6286e598
Fix for new file creation after change master to new log file
...
Fix for new file creation after change master to new log file
2015-10-23 15:35:48 +02:00
3be5238bd7
Fixed indentation.
2015-10-23 15:05:51 +03:00
63f4bc3aec
Changed from router->binlog_lock to router->lock for transaction safety code and cleaned up code.
2015-10-23 14:54:08 +03:00
1dc48f5ed8
Merge branch 'develop' into 1.2.1-binlog_router_trx
2015-10-23 13:18:11 +02:00
40ffe21dd8
Added a variable for current event being processed after a transaction is committed.
2015-10-23 12:33:51 +03:00
add1927781
Reformatted to make line-length < 110.
2015-10-21 09:46:52 +03: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
9b65e0b8b6
Fixed compiler warnings.
2015-10-14 10:58:32 +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
e38ea9d07d
Correct missing return value.
2015-10-02 16:19:59 +01: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
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
4f316419c5
Merge branch 'develop' into MXS-329
2015-09-30 12:47:28 +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
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
b6df52a68e
Addition of slave heartbeat check
...
Addition of slave heartbeat check
2015-09-25 15:58:36 +02:00
2231d0870c
Place checks in callback routines because DCB will not always contain a reference to a router session, and the associated data will be invalid in this case.
2015-09-25 12:17:18 +01:00
2dfb9e3c11
Merge branch 'develop' into MXS-329
2015-09-24 17:59:36 +03:00
f7946a05fa
Fix in extract_message
...
Fix in extract_message
2015-09-23 14:05:02 +02:00
ef15825efb
Fixes suggested by Valgrind tool
...
Fixes suggested by Valgrind tool
2015-09-23 11:46:00 +02:00
72f08de889
Removed duplicated code
...
Removed duplicated code
2015-09-22 16:50:11 +02:00
de8e54da8b
Fix for compile error
...
Fix for compile error
2015-09-21 09:00:39 +02:00
