Commit Graph

389 Commits

Author SHA1 Message Date
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
2c12ba3d16 Various fixes
Various fixes for initialisation and packet size allocation
2015-09-21 09:00:20 +02:00
f97df72a3e Fix for compile error
Fix for compile error
2015-09-21 08:52:39 +02:00
2ce6012506 Various fixes
Various fixes for initialisation and packet size allocation
2015-09-21 08:44:33 +02:00
511e0fe119 Merge Fix from develop
Merge Fix from develop
2015-09-18 16:10:41 +02:00
8d5ca11374 Fixed: spinlock_release is before free
Fixed: spinlock_release is before free
2015-09-18 16:05:22 +02:00
89748d9b21 Binlog identity log message update
Binlog identity log message update
2015-09-18 11:18:32 +02:00
840afc0815 Develop merge
Develop merge
2015-09-18 11:15:48 +02:00
2a2582067a Added fix blr_slave_register reply
Added fix blr_slave_register reply
2015-09-18 11:06:03 +02:00
67069d1685 Fixed Typo
Fixed Typo
2015-09-18 11:01:54 +02:00
74d69eb64d Added missing slave state BLRS_REGISTERED
Added missing slave state BLRS_REGISTERED
2015-09-18 10:50:12 +02:00
81e186fd92 server-id reported as server_id in binlog_identity log
server-id reported as server_id in binlog_identity log
2015-09-18 10:09:11 +02:00
c26dfbc779 Added blr_slave_send_ok in blr_slave_register
Added blr_slave_send_ok in blr_slave_register
2015-09-18 09:37:07 +02:00
cbfc6ea6b0 Fix OK packet for blr_slave_register() reply
Fix OK packet for blr_slave_register() reply
2015-09-18 09:23:02 +02:00
9829a8c2c2 Added: validating binlog file message
Added: validating binlog file message
2015-09-16 19:04:48 +02:00
633131fffd Fix for information_schema.STATUS in Uptime
Fix for information_schema.STATUS in Uptime
2015-09-16 18:15:12 +02:00
3822cae9c2 blr_log_identity() moved to the right location
blr_log_identity() moved to the right location
2015-09-16 17:28:32 +02:00
e4677fbd44 Log message fix
Log message fix
2015-09-16 17:16:20 +02:00
faaf33918d Binlog Identity is logged with MESSAGE
Binlog Identity is logged with MESSAGE
2015-09-16 15:44:50 +02:00
fac4b3ff11 Fix for MariaDB 10
Fix for MariaDB 10
2015-09-15 19:10:23 +02:00
c12233db0d Small fixes
Small fixes
2015-09-15 16:50:15 +02:00
374056cecc Valgrind fixes
Valgrind fixes
2015-09-15 16:18:10 +02:00
4732cc639c Error handling for invalid SHOW [GLOBAL] STATUS command
Error handling for invalid SHOW [GLOBAL] STATUS command
2015-09-15 15:57:31 +02:00
6b05176684 Fixed errors reported by valgrind
Fixed errors reported by valgrind
2015-09-15 15:49:41 +02:00
abf5b6d02a Addition of status variable output formatting
Addition of status variable output formatting and router options check
and check for mandatory server_id parameter
Logging of binlog router identy seen by master and slaves
2015-09-15 15:13:05 +02:00
6817db3ae1 Added checks for empty values
Added checks for empty values
2015-09-15 09:48:04 +02:00
0cf4b2cf68 Fix to overcome failure on certain packets. 2015-09-15 08:37:41 +01:00
3f4acf4bc5 Added support for SHOW [GLOBAL] STATUS LIKE 'Uptime'
Added support for SHOW [GLOBAL] STATUS LIKE 'Uptime'
2015-09-15 09:17:52 +02:00
9cd9a6183b Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-14 21:13:14 +02:00
2829a8ce05 Added missing check for empty result set in binlogrouter. 2015-09-14 21:20:22 +03:00
c2c27d7cca Merge from develop
Merge from develop
2015-09-14 09:49:33 +02:00
955974d06b Removed unused XID var
Removed unused XID var
2015-09-14 09:43:13 +02:00
bb72b0c892 Fixed compiler warnings. 2015-09-12 04:46:47 +03:00
3fe317f69b Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-11 15:22:17 +02:00
9fda8dcc26 Changed link order.
Did not link on Ubuntu.
2015-09-11 13:57:24 +03:00
520198b870 Removed previous conflict line
Removed previous conflict line
2015-09-10 15:06:46 +02:00
b4637edd59 Added skygw_log_sync_all
Added skygw_log_sync_all
2015-09-10 15:01:01 +02:00
c9fd82839b Merge from develop
Merge from develop
2015-09-10 14:53:50 +02:00