Commit Graph

823 Commits

Author SHA1 Message Date
e645007d3f Fixed empty packets being mishandled. 2015-07-22 16:49:47 +03:00
7363343499 Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK. 2015-07-22 15:34:51 +03:00
19d9c9982f Fixed session commands being executed multiple times. 2015-07-22 14:39:18 +03:00
06eed9914a Merge branch 'master' into schemarouter_refresh 2015-07-20 11:42:43 +03:00
aa6294f1f2 Fixed binlogrouter not working with C99 flags. 2015-07-20 08:59:35 +03:00
b756690123 Merge branch 'release-1.2' into develop 2015-07-15 11:38:27 +03:00
124ad82de4 Small fix to readwritesplit session command handling. 2015-07-15 11:02:59 +03:00
78eab19c62 Fixed compiler warnings. 2015-07-14 17:13:09 +03:00
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
40f4d8ee8f Revert "converted inline functions to normal functions."
This reverts commit b592e226e2c56b4b80215cdc37459e5e79beeb21.
2015-07-14 12:10:41 +03:00
b592e226e2 converted inline functions to normal functions. 2015-07-14 12:05:56 +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
206f93e3ec Fixed missing return values. 2015-07-11 19:02:01 +03:00
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
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
3a69a87df1 Merge branch 'rwsplit_fixes' into release-1.2 2015-07-08 14:12:53 +03:00
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00
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
fb09cbf100 Fixed queries being routed when the session is already closing. 2015-07-07 13:15:23 +03:00
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
1af73b7061 Fixed common sharding functions referring to schemarouter. 2015-07-06 18:12:08 +03:00
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
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
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
a2e281823a Added NULL checks to readwritesplit. 2015-06-30 14:58:36 +03:00
c6f43c0058 Merge branch 'MXS-171' into develop 2015-06-29 12:04:43 +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
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
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
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
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
b1c383b19e Added database list refreshing to schemarouter. 2015-06-09 16:13:06 +03:00
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
2f2c9c8cbc Fix for MariaDB10 state machine
Fix for MariaDB10 state machine
2015-06-02 09:45:26 +02:00
351f52b8e1 Add "show persistent {server}" 2015-05-27 09:57:18 +01:00