Commit Graph

1703 Commits

Author SHA1 Message Date
1eb907ad38 Fixed common sharding functions referring to schemarouter. 2015-07-03 17:08:32 +03:00
a9e0a52b9e Fixed false positives in SHOW SHARDS detection. 2015-07-03 13:59:25 +03:00
5964a68143 Added SHOW SHARDS functionality into schemarouter. 2015-07-03 13:44:22 +03:00
993ec723b9 Added verbose client errors to schemarouter. 2015-07-02 13:28:23 +03:00
3989e0dc6b Merge branch 'develop' into schemarouter_refresh 2015-07-02 12:20:14 +03:00
c8173ec4f7 Added missing return value. 2015-07-02 10:00:38 +03:00
8ea11c5018 Merge branch 'develop' into MXS-230 2015-07-01 19:19:50 +03:00
2b0f0b89ab Added master server id to mysql 5.1 monitoring. 2015-07-01 19:13:03 +03:00
22f8e61321 Fixed build failure. 2015-07-01 16:47:00 +03:00
dc15fbb576 Fixed build failure. 2015-07-01 16:46:32 +03:00
53a4dd393d Fix to a Coverity defect. 2015-07-01 16:08:33 +03:00
6c61dabfab Fix to a Coverity defect. 2015-07-01 05:15:08 +03:00
e350f19e6f Added NULL checks to readwritesplit. 2015-06-30 21:59:09 +03:00
8a0b399896 Added code for MySQL 5.1 replication detection. 2015-06-30 21:37:29 +03:00
5165c6b981 master.ini contains now master configuration
master.ini contains now master configuration
It can be created or modified by CHANGE MASTER TO
Added new BLRM_UNCONFIGURED state
2015-06-30 16:10:02 +02:00
a2e281823a Added NULL checks to readwritesplit. 2015-06-30 14:58:36 +03:00
6f343ff57b Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227
Fixed memory leak.
2015-06-29 19:17:12 +03:00
c6f43c0058 Merge branch 'MXS-171' into develop 2015-06-29 12:04:43 +03:00
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
5c7a30e9fe Added more error logging. 2015-06-28 10:43:06 +03:00
113fb4c33b Fix to MXS-209: https://mariadb.atlassian.net/browse/MXS-209
Added missing checks for proper column count on query result.
2015-06-28 08:43:05 +03:00
4759df9f87 Added proper wildcard database grant detection. 2015-06-27 09:08:20 +03:00
93858967b7 Removed useless ANYDB checks.
Conflicts:
	server/modules/protocol/mysql_common.c
2015-06-27 09:01:55 +03:00
c40818b8f7 Merge branch 'develop' into schemarouter_refresh 2015-06-27 08:29:37 +03:00
c9606e1071 Fixed build failures due to mismatching function prototypes. 2015-06-27 08:28:37 +03:00
530011b9b8 Merge branch 'develop' into schemarouter_refresh 2015-06-27 06:33:58 +03:00
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +01:00
b526da1fd4 Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
2015-06-26 09:52:57 +02:00
e5d9abbdcb Fixes to Coverity defects. 2015-06-25 06:01:33 +03:00
011c932c7d Fix mistake in testing for null password; add contents with links to MaxAdmin reference guide. 2015-06-24 21:44:02 +01:00
e4bde4402b Fix problem of certain passwords (e.g. joomla1) being treated incorrectly as null MXS-202. 2015-06-24 21:06:56 +01:00
7a8c307515 MXS-171: https://mariadb.atlassian.net/browse/MXS-171
Added option which allows the master server to be used for reads.
2015-06-24 19:23:43 +03:00
cd7f7aba57 CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
2015-06-23 17:42:42 +02:00
543873a44f Add default for missing MASTER_LOG_POS
Add default for missing MASTER_LOG_POS

4 if binlog is a new one
current pos if binlog = current one
2015-06-23 17:19:54 +02:00
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
7a0a010a86 CHANGE MASTER error messages improvement
CHANGE MASTER error messages improvement
New Start Slave implementation
Error Handling when master_state is BLRM_BINLOGDUMP: in case of error
master replication stops and new state is BLRM_SLAVE_STOPPED
2015-06-23 15:34:56 +02:00
022179ca12 start slave may create a new binlog file
start slave may create a new binlog file
2015-06-23 10:05:39 +02:00
71664f162b Merge branch 'develop' into dev-mdb10 2015-06-22 19:27:34 +03:00
15e6d6f9fc fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()
2015-06-22 18:24:39 +02:00
2816d87013 fix for missing crc check in blr_slave_fake_rotate()
fix for missing crc check in blr_slave_fake_rotate()

fix for missing @@version_comment in order to allow mysql client get in
2015-06-22 18:21:43 +02:00
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
b880350cf3 Complete merge of latest develop branch 2015-06-22 10:39:13 +01:00
8c900e73de removed extra blr_file_add_magic
removed extra blr_file_add_magic
2015-06-22 10:46:00 +02:00
5bc07c5100 Added error handling in BINLOG_DUMP phase
Added error handling in BINLOG_DUMP phase: router goes into
BLRM_SLAVE_STOPPED state

Removed blr_file_add_magic called twice
2015-06-22 10:35:02 +02:00
c3aa5beeb4 Added missing initialization from MM monitor. 2015-06-21 19:32:19 +03:00
4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
f6369a1661 Changed from server unique name to ip:port in monitor script initiaion. 2015-06-18 18:03:55 +03:00
64bb68c12c inst->master_chksum = true; is put back
inst->master_chksum = true; is put back
2015-06-17 12:23:31 +02:00
f0aed1f666 Fixed possible null pointer dereferences in mysql_backend. 2015-06-17 10:05:56 +03:00
4952dc48bb Added constraints to CHANGE MASTER TO options
Added constraints to CHANGE MASTER TO options  MASTER_LOG_FILE and
MASTER_LOG_POS
2015-06-15 15:03:27 +02:00