1104 Commits

Author SHA1 Message Date
Markus Makela
3628b6db60 Moved some of the binlogrouter sanity checks to be done before any memory allocation takes place. 2015-07-23 11:12:26 +03:00
Markus Makela
e645007d3f Fixed empty packets being mishandled. 2015-07-22 16:49:47 +03:00
Markus Makela
7363343499 Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK. 2015-07-22 15:34:51 +03:00
Markus Makela
19d9c9982f Fixed session commands being executed multiple times. 2015-07-22 14:39:18 +03:00
Markus Makela
06eed9914a Merge branch 'master' into schemarouter_refresh 2015-07-20 11:42:43 +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
MassimilianoPinto
f22e2ec87b Added Connecting state in Slave_IO_Running
Added ‘Connecting’ state in Slave_IO_Running field of SHOW SLAVE STATUS
2015-07-15 09:18:55 +02:00
MassimilianoPinto
7b9d54d1d4 Removed MASTER_PASSWORD from logs
Removed MASTER_PASSWORD from logs
2015-07-14 17:32:42 +02: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
MassimilianoPinto
df17527527 Fixed wrong message parameter
Fixed wrong message parameter
2015-07-13 19:28:32 +02:00
MassimilianoPinto
37fd2b6e87 Added chmod 600 for master.ini
Added chmod 600 for master.ini
2015-07-13 19:00:22 +02:00
MassimilianoPinto
9480c01b96 New log messages for dbusers loading failure
New log messages for dbusers loading failure
2015-07-13 18:12:34 +02:00
Markus Makela
e146b2d632 Merge branch 'release-1.2' into schemarouter_refresh 2015-07-13 19:10:05 +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
a16d4c46d6 Changed default master port to 3306
Changed default master port to 3306
2015-07-13 12:44:03 +02: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
a9e0a52b9e Fixed false positives in SHOW SHARDS detection. 2015-07-03 13:59:25 +03:00
Markus Makela
5964a68143 Added SHOW SHARDS functionality into schemarouter. 2015-07-03 13:44:22 +03:00
Markus Makela
993ec723b9 Added verbose client errors to schemarouter. 2015-07-02 13:28:23 +03:00
Markus Makela
3989e0dc6b Merge branch 'develop' into schemarouter_refresh 2015-07-02 12:20:14 +03:00
Markus Makela
22f8e61321 Fixed build failure. 2015-07-01 16:47:00 +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
6c61dabfab Fix to a Coverity defect. 2015-07-01 05:15:08 +03:00
Markus Makela
e350f19e6f Added NULL checks to readwritesplit. 2015-06-30 21:59:09 +03:00
MassimilianoPinto
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
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
c40818b8f7 Merge branch 'develop' into schemarouter_refresh 2015-06-27 08:29:37 +03:00
Markus Makela
c9606e1071 Fixed build failures due to mismatching function prototypes. 2015-06-27 08:28:37 +03:00
Markus Makela
530011b9b8 Merge branch 'develop' into schemarouter_refresh 2015-06-27 06:33:58 +03:00
counterpoint
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +01:00
MassimilianoPinto
b526da1fd4 Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
Added fix in CHANGE MASTER TO when MASTER_LOG_FILE is not set
2015-06-26 09:52:57 +02: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
MassimilianoPinto
cd7f7aba57 CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
CHAGE MASTER TO new binlog requires MASTER_LOG_POS to be set
2015-06-23 17:42:42 +02:00