Commit Graph

4045 Commits

Author SHA1 Message Date
26b0ff8e77 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-21 09:03:13 +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
601eac5a5d Fixed parent-child code being called in non-daemon mode. 2015-09-18 17:26:27 +03: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
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
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
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
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
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
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
6ad89cb986 Removed boolean value assignment to an integer variable. 2015-09-16 13:36:33 +03:00
6c75e09f29 Fixed multi-source replication not working. 2015-09-16 11:54:56 +03:00
ea2c454010 Minor modification to documentation. 2015-09-16 11:19:20 +03: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
5aa882fc7e Made documentation cleaner. 2015-09-16 10:24:17 +03:00
fe9babe9ec Cleaned up code. 2015-09-16 10:22:29 +03:00
87b50ac337 Merge branch 'MXS-279' into develop 2015-09-16 10:01:21 +03: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
a2d91678c7 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-15 15:17:20 +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
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
6817db3ae1 Added checks for empty values
Added checks for empty values
2015-09-15 09:48:04 +02: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
e443351341 Fix to MXS-279: https://mariadb.atlassian.net/browse/MXS-279
Added NULL checks to block buffer initialization and checks for return values to functions that use it.
2015-09-14 16:29:14 +03:00
c2c27d7cca Merge from develop
Merge from develop
2015-09-14 09:49:33 +02:00