hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,659 Commits 1 Branch 0 Tags
Commit Graph

759 Commits

Author SHA1 Message Date
Markus Makela
19d9c9982f Fixed session commands being executed multiple times. 2015-07-22 14:39:18 +03:00
Markus Makela
aa6294f1f2 Fixed binlogrouter not working with C99 flags. 2015-07-20 08:59:35 +03:00
Markus Makela
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
Markus Makela
124ad82de4 Small fix to readwritesplit session command handling. 2015-07-15 11:02:59 +03:00
Markus Makela
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
Markus Makela
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
Markus Makela
40f4d8ee8f Revert "converted inline functions to normal functions." 
This reverts commit b592e226e2c56b4b80215cdc37459e5e79beeb21.
 2015-07-14 12:10:41 +03:00
Markus Makela
b592e226e2 converted inline functions to normal functions. 2015-07-14 12:05:56 +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
Markus Makela
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
Markus Makela
6497350ab7 Merge branch 'release-1.2' into develop 
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
 2015-07-11 17:12:48 +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
Markus Makela
3a69a87df1 Merge branch 'rwsplit_fixes' into release-1.2 2015-07-08 14:12:53 +03:00
counterpoint
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00
Markus Makela
af2ce0f4f1 Fix to MXS-252: https://mariadb.atlassian.net/browse/MXS-252 
Added missing buffer length parameter.
 2015-07-08 12:45:48 +03:00
Markus Makela
fb09cbf100 Fixed queries being routed when the session is already closing. 2015-07-07 13:15:23 +03:00
Markus Makela
c2e51f2e98 Fix to MXS-223: https://mariadb.atlassian.net/browse/MXS-223 
Added a temporary buffer to prevent losing the pointer to the cloned buffer when dcb->func.write fails.
 2015-07-07 08:16:29 +03:00
Markus Makela
1af73b7061 Fixed common sharding functions referring to schemarouter. 2015-07-06 18:12:08 +03:00
Markus Makela
dc646bfbf1 Fix to MXS-244: https://mariadb.atlassian.net/browse/MXS-244 
Fixed buffers being only partially consumed if they contained more than one packet
when a replu to a prepared statement is received.
 2015-07-04 09:07:37 +03:00
Markus Makela
dc15fbb576 Fixed build failure. 2015-07-01 16:46:32 +03:00
Markus Makela
53a4dd393d Fix to a Coverity defect. 2015-07-01 16:08:33 +03:00
Markus Makela
a2e281823a Added NULL checks to readwritesplit. 2015-06-30 14:58:36 +03:00
Markus Makela
c6f43c0058 Merge branch 'MXS-171' into develop 2015-06-29 12:04:43 +03:00
Markus Makela
c9606e1071 Fixed build failures due to mismatching function prototypes. 2015-06-27 08:28:37 +03:00
counterpoint
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +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
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
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
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
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
2f2c9c8cbc Fix for MariaDB10 state machine 
Fix for MariaDB10 state machine
 2015-06-02 09:45:26 +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
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