227 Commits

Author SHA1 Message Date
Markus Makela
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
Markus Makela
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
MassimilianoPinto
9728ec6169 Addition of new mariadb10 events to diagnostics()
Addition of new mariadb10 events to diagnostics()
2015-07-13 12:54:04 +03:00
counterpoint
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
counterpoint
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00
Martin Brampton
011c932c7d Fix mistake in testing for null password; add contents with links to MaxAdmin reference guide. 2015-06-24 21:44:02 +01:00
Martin Brampton
e4bde4402b Fix problem of certain passwords (e.g. joomla1) being treated incorrectly as null MXS-202. 2015-06-24 21:06:56 +01:00
Markus Makela
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
counterpoint
09fdb0a2c2 Hopefully final tidy up. 2015-06-23 14:58:53 +01: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
Markus Makela
1c36cfb285 Added more debug output. 2015-06-08 18:04:43 +03:00
Markus Makela
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
Markus Makela
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
Markus Makela
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
Markus Makela
0f814d3e73 Added SSL write and read functions. 2015-05-29 13:00:37 +03:00
Markus Makela
a572166ffd Added ssl handshake to mysql_client 2015-05-28 22:19:50 +03:00
Markus Makela
16d6bd6d2c Added service SSL mode variables. 2015-05-28 11:56:14 +03: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
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
e9391ef486 MariaDB 10 optional compatibility
MariaDB 10 optional compatibility with mariadb10-compatibility=1
2015-05-07 15:16:37 +02:00
Markus Makela
8afa46b8b2 Removed BLRM_MAXSTATE_MARIADB10 and set BLRM_MAXSTATE to 0x014 2015-05-07 13:00:34 +03: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
Markus Makela
463cd4a97e Moved common sharding functions to a separate file. 2015-05-04 07:06:24 +03:00
Markus Makela
21ad6fba2a Added option to disable slave recovery in readwritesplit. 2015-04-24 05:55:06 +03:00
Markus Makela
fbfbc9fda7 Added more statistics to schemarouter diagnostics. 2015-04-23 21:00:52 +03:00
Markus Makela
8d4f301545 Added the option to disable session command history to readwritesplit. 2015-04-23 20:12:04 +03:00
Markus Makela
d1551be54f Added support for disabling the saving of the session command history for the schemarouter. 2015-04-23 19:35:41 +03:00
Markus Makela
811c13fe32 Added more statistics to the schemarouter. 2015-04-23 06:04:09 +03:00
Markus Makela
6f870bd74c Added maximum session command amount for schemarouter. 2015-04-22 20:58:52 +03:00
Markus Makela
253c63e958 Fixed schemarouter not handling show databases queries spanning multiple buffers. 2015-04-14 18:50:19 +03:00
MassimilianoPinto
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
Markus Makela
e42f171564 Added support for direct connections to shardrouter. 2015-03-30 20:45:05 +03:00
Markus Makela
7cfc1d3cc9 Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'. 2015-03-23 14:53:31 +02:00
Markus Makela
5fa4e3299b Fixed schemarouter not storing queries received before database mapping was done. 2015-03-12 20:03:49 +02:00
Markus Makela
6766c0b883 Added statistics to backend references. 2015-03-06 17:41:39 +02:00
Markus Makela
282f66f9fd Merge branch 'develop' into MAX-324
Conflicts:
	utils/skygw_utils.cc
2015-03-06 17:07:39 +02:00
Markus Makela
c937568624 Fixed a possible memory leak when session command history limits are used. 2015-03-05 20:46:55 +02:00
Markus Makela
880adca73e Merge branch 'develop' into MAX-324 2015-03-05 10:45:48 +02:00
Markus Makela
1b0fd4576a Merge branch 'maxinfo' into develop
Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h
2015-03-04 11:33:00 +02:00
Markus Makela
2d08bc4eda Fix to bug 736: http://bugs.mariadb.com/show_bug.cgi?id=736
Added a cofigurable limit on the number of session commands the readwritesplit router stores.
2015-03-01 02:27:47 +02:00
Markus Makela
9e7afeb302 Merge branch 'develop' into MAX-324
Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
Markus Makela
5477cdf5eb Renamed the dbshard module to schemarouter. 2015-02-24 05:49:38 +02:00
Markus Makela
c47d2f3791 Added session timeouts.
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
Markus Makela
7fc004ec28 Merge branch 'develop' into MAX-324 2015-02-20 10:18:45 +02:00
Markus Makela
22f7137440 Fix to bug 600: http://bugs.mariadb.com/show_bug.cgi?id=600
readwritesplit now drops slave connections that fail a session command.
2015-02-20 06:38:38 +02:00
Mark Riddoch
df3a548be1 Added basic REST interface to maxinfo plugin 2015-02-19 16:24:30 +00:00
Mark Riddoch
8e941f7523 Addition of the MaxInfo filter and the generic MaxScale resultset 2015-02-18 17:25:13 +00:00
Markus Makela
02e11b96b0 Changed references of dbshard into shardrouter in shardrouter.c 2015-02-17 12:14:48 +02:00