1104 Commits

Author SHA1 Message Date
MassimilianoPinto
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
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01:00
MassimilianoPinto
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
MassimilianoPinto
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
Markus Makela
71664f162b Merge branch 'develop' into dev-mdb10 2015-06-22 19:27:34 +03:00
MassimilianoPinto
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
MassimilianoPinto
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
Markus Makela
2d9c9425c5 Merge branch 'binlog_router_mariadb10' into dev-mdb10
Conflicts:
	server/core/config.c
2015-06-22 19:16:38 +03:00
MassimilianoPinto
8c900e73de removed extra blr_file_add_magic
removed extra blr_file_add_magic
2015-06-22 10:46:00 +02:00
MassimilianoPinto
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
Martin Brampton
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
MassimilianoPinto
64bb68c12c inst->master_chksum = true; is put back
inst->master_chksum = true; is put back
2015-06-17 12:23:31 +02:00
MassimilianoPinto
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
MassimilianoPinto
d94ac9c637 Added new general error message
Added new general error message
Added
Slave_IO_Running: No
Slave_SQL_Running: No

when slave is stopped
2015-06-09 16:46:41 +02:00
Markus Makela
b1c383b19e Added database list refreshing to schemarouter. 2015-06-09 16:13:06 +03:00
counterpoint
d0e92a15f8 Move decrement of server connections into zombie processing; introduce dcb_close_finish to be called either in dcb_close or when persistent dcb is discarded. 2015-06-09 11:41:43 +01:00
MassimilianoPinto
1cbc7d6e7f Added error string to router->m_errmsg
Added error string to router->m_errmsg
2015-06-09 12:39:50 +02:00
MassimilianoPinto
f46c47651a Compile error, missing ';'
Compile error, missing ';'
2015-06-09 10:33:23 +02:00
MassimilianoPinto
2db4f4d771 Added error_msg to blr_slave_send_slave_status()
Added error_msg to blr_slave_send_slave_status()
2015-06-08 19:16:50 +02:00
MassimilianoPinto
d9234bec5f Updated logging messages
Updated logging messages
2015-06-08 17:30:26 +02:00
MassimilianoPinto
809cdb5b1e Added blr_cache_read_master_data and dcb checks
Added blr_cache_read_master_data()
Added dcb checks before calling db_close
Forced initialisation values of some parameters
2015-06-08 16:56:52 +02:00
MassimilianoPinto
945e2f8132 added checks in blr_stop_slave()
errorReply sets mysql_errno into router struct
blr_slave_send_slave_status displays mysql errno
added checks in blr_stop_slave()
2015-06-05 17:37:05 +02:00
MassimilianoPinto
2a15e6e774 server_update_port/address are used
server_update_port and server_update_address now used by
blr_handle_change_master
2015-06-03 10:30:03 +02:00
MassimilianoPinto
cedaeb7fe9 MariaDB10 embedded library version string
MariaDB10 embedded library version string
2015-06-03 09:41:12 +02:00
MassimilianoPinto
2f2c9c8cbc Fix for MariaDB10 state machine
Fix for MariaDB10 state machine
2015-06-02 09:45:26 +02:00
MassimilianoPinto
6cb0248ab8 Addition of MASTER_USER and MASTER_PASSWORD
Addition of MASTER_USER and MASTER_PASSWORD
2015-06-01 11:15:43 +02:00
MassimilianoPinto
392c71df07 Addition of CHANGE MASTER TO
Addition of CHANGE MASTER TO … command.

Current handled command has four options, example:

change master to MASTER_LOG_FILE='mysql-bin.000049',
MASTER_LOG_POS=245, MASTER_HOST='127.0.0.1', MASTER_PORT=3307;
2015-05-29 17:01:34 +02:00
MassimilianoPinto
f54fcc7e4e changed stop/start slave error message
changed stop/start slave error message including
errors code and status message

ERROR 1254 (HY000): Slave connection is already running
ERROR 1199 (HY000): Slave connection is not running
2015-05-28 11:14:59 +02:00
MassimilianoPinto
453dd64273 Added dcb_close for router->client session
Added dcb_close for router->client session and queue residual cleanup
2015-05-27 15:29:38 +02:00
counterpoint
351f52b8e1 Add "show persistent {server}" 2015-05-27 09:57:18 +01:00
Markus Makela
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
MassimilianoPinto
7634f22a94 STOP/START SLAVE first implementation
STOP/START SLAVE first implementation
2015-05-25 17:37:39 +02:00
Markus Makela
0d85ae6603 Changed data directory to /var/lib/maxscale. 2015-05-22 11:31:22 +03:00
Markus Makela
8301410c79 Fixed possible memory leaks in schemarouter. 2015-05-11 22:02:35 +03:00
MassimilianoPinto
a48e694dba Fix for log messages
Fix for log messages about MariaDB 10 registration and unexpected query
2015-05-11 12:42:14 +02:00
MassimilianoPinto
f991e58b57 MariaDB 10 master requires MariaDB 10 slaves
Only MariaDB 10 slaves can register to binblog server with a MariaDB 10
Master
2015-05-11 11:43:21 +02:00
Markus Makela
ff2462f2d2 Fix to MXS-127:https://mariadb.atlassian.net/browse/MXS-127
Corrected the wrong session commands being deleted.
2015-05-09 11:25:18 +03:00
MassimilianoPinto
230f88737c Added reading saved mariadb10 data
Added reading saved mariadb10 data
2015-05-07 18:05:04 +02:00
MassimilianoPinto
5d1e09ca4f Added MariaDB 10 Compatibility without GTID
Added MariaDB 10 Compatibility without GTID
2015-05-07 17:14:39 +02:00
MassimilianoPinto
7d48779913 Added MAX_EVENT_TYPE_MARIADB10 check
Added MAX_EVENT_TYPE_MARIADB10 check  for router->mariadb10_compat
2015-05-07 17:02:33 +02:00
MassimilianoPinto
2c2a03a6f6 Always reply to SET @mariadb_slave_capability
Always reply to SET @mariadb_slave_capability, with saved master reply
for mariadb10 master or with OK otherwise
2015-05-07 16:10:35 +02:00
MassimilianoPinto
3f2876bde3 Fixed buffer free
Fixed buffer free
2015-05-07 15:32:12 +02:00
MassimilianoPinto
e9391ef486 MariaDB 10 optional compatibility
MariaDB 10 optional compatibility with mariadb10-compatibility=1
2015-05-07 15:16:37 +02:00
Markus Makela
bc7cc2a466 Added variables for MariaDB 10 compatibility. 2015-05-07 12:56:58 +03:00
MassimilianoPinto
5c7b2a68e5 mariadb10 compatibility test without GTID
First implementation of mariadb10 compatibility test without GTID

State machine to be modified for mysql5.6/mariadb10 compatibility
router options for mariadb10 slave registration still missing
2015-05-06 12:19:18 +02:00
counterpoint
8647b30184 Merge remote-tracking branch 'origin/develop' into MXS-105
Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c
2015-05-05 10:54:09 +01:00
Markus Makela
463cd4a97e Moved common sharding functions to a separate file. 2015-05-04 07:06:24 +03:00
Markus Makela
d545150ceb Fix to MXS-70: https://mariadb.atlassian.net/browse/MXS-70
Added assert information to error log.
2015-05-02 05:51:25 +03:00
Markus Makela
550b130d91 Schemarouter shortest session statistic now only updates session with a length of more than zero seconds. 2015-05-01 11:13:43 +03:00
Markus Makela
2498278582 Fixed queued queries not being freed if session was closed before they could be routed. 2015-04-30 22:22:26 +03:00