Commit Graph

391 Commits

Author SHA1 Message Date
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
e146b2d632 Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:10:05 +03:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
9728ec6169 Addition of new mariadb10 events to diagnostics()
Addition of new mariadb10 events to diagnostics()
2015-07-13 12:54:04 +03:00
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01: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
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
530011b9b8 Merge branch 'develop' into schemarouter_refresh 2015-06-27 06:33:58 +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
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
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
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
c2d69850de Merge branch 'develop' into schemarouter_refresh 2015-06-15 08:48:13 +03:00
b1c383b19e Added database list refreshing to schemarouter. 2015-06-09 16:13:06 +03:00
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
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
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
6e01757455 Added error message to users when trying to connect to a MaxScale service that only allows SSL connections. 2015-06-02 06:39:51 +03:00
d7232d8b6e Moved SSL structure to the DCB instead of the MySQL protocol.
This allows for non-MySQL SSL connections.
2015-06-01 20:51:26 +03:00
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03:00
7634f22a94 STOP/START SLAVE first implementation
STOP/START SLAVE first implementation
2015-05-25 17:37:39 +02:00
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
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
e9391ef486 MariaDB 10 optional compatibility
MariaDB 10 optional compatibility with mariadb10-compatibility=1
2015-05-07 15:16:37 +02:00
8afa46b8b2 Removed BLRM_MAXSTATE_MARIADB10 and set BLRM_MAXSTATE to 0x014 2015-05-07 13:00:34 +03:00
bc7cc2a466 Added variables for MariaDB 10 compatibility. 2015-05-07 12:56:58 +03:00
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
8e4a5ce807 Moved common sharding functions to a separate file. 2015-05-06 11:59:12 +03:00
463cd4a97e Moved common sharding functions to a separate file. 2015-05-04 07:06:24 +03:00
21ad6fba2a Added option to disable slave recovery in readwritesplit. 2015-04-24 05:55:06 +03:00
fbfbc9fda7 Added more statistics to schemarouter diagnostics. 2015-04-23 21:00:52 +03:00
8d4f301545 Added the option to disable session command history to readwritesplit. 2015-04-23 20:12:04 +03:00
d1551be54f Added support for disabling the saving of the session command history for the schemarouter. 2015-04-23 19:35:41 +03:00
811c13fe32 Added more statistics to the schemarouter. 2015-04-23 06:04:09 +03:00
6f870bd74c Added maximum session command amount for schemarouter. 2015-04-22 20:58:52 +03:00
253c63e958 Fixed schemarouter not handling show databases queries spanning multiple buffers. 2015-04-14 18:50:19 +03:00
5ce1b742e9 Binlog Router, slave binlog_pos is now uint32
Binlog Router, slave binlog_pos is now uint32
2015-04-02 16:52:48 +02:00
e42f171564 Added support for direct connections to shardrouter. 2015-03-30 20:45:05 +03:00
7cfc1d3cc9 Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'. 2015-03-23 14:53:31 +02:00
5fa4e3299b Fixed schemarouter not storing queries received before database mapping was done. 2015-03-12 20:03:49 +02:00