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

1501 Commits

Author SHA1 Message Date
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
96edaca90c Disabled C99. 2015-07-14 12:14:01 +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
Markus Makela
6c5c88ccf0 Merge branch 'priority_galeramon' into develop 2015-07-13 14:39:33 +03:00
Markus Makela
19fe7127d5 Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
Markus Makela
056ad50458 Merge branch 'release-1.2' into MXS-230 2015-07-13 13:08:37 +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
4f5de063eb Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter). 2015-07-10 15:12:22 +01:00
Markus Makela
af6e010ba1 Added missing namedserverfilter documentation. 2015-07-10 13:51:32 +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
c50308fba5 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-07-08 10:06:11 +03:00
Markus Makela
2580738509 Merge branch 'develop' into priority_galeramon 2015-07-07 20:45:54 +03:00
Markus Makela
058f49eb88 Added error message about MySQL versions lower than 5.5 and monitors without the 'mysql51_replication' enabled. 2015-07-07 20:14:57 +03:00
Markus Makela
b47da33a33 Merge branch 'develop' into MXS-230 2015-07-07 19:45:42 +03:00
counterpoint
4c8aa02c31 Finalise comments; change abort from assert(false) to raise(SIGABRT). 2015-07-07 16:57:13 +01:00
counterpoint
be789855ee Add lines to revision history. 2015-07-07 16:57:12 +01:00
counterpoint
fffd8fb73a Unify DCB close processing to single function dcb_close. Remove dcb_add_to_zombieslist (incorporating logic into dcb_close). Alter logic so that DCB that is just allocated will still go to zombie list if dcb->fd is not closed. 2015-07-07 16:57:12 +01:00
counterpoint
44fcb9bc31 Fix for incorrect password handling. 2015-07-07 16:57:12 +01:00
counterpoint
a72f462e2d Fixes for MXS-196 and other related problems. 2015-07-07 16:57:12 +01: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
03b5a634f4 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:04:53 +03:00
Markus Makela
1eb907ad38 Fixed common sharding functions referring to schemarouter. 2015-07-03 17:08:32 +03:00
Markus Makela
c8173ec4f7 Added missing return value. 2015-07-02 10:00:38 +03:00
Markus Makela
8ea11c5018 Merge branch 'develop' into MXS-230 2015-07-01 19:19:50 +03:00
Markus Makela
2b0f0b89ab Added master server id to mysql 5.1 monitoring. 2015-07-01 19:13:03 +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
Markus Makela
8a0b399896 Added code for MySQL 5.1 replication detection. 2015-06-30 21:37:29 +03:00
Markus Makela
a2e281823a Added NULL checks to readwritesplit. 2015-06-30 14:58:36 +03:00
Markus Makela
6f343ff57b Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227 
Fixed memory leak.
 2015-06-29 19:17:12 +03:00
Markus Makela
c6f43c0058 Merge branch 'MXS-171' into develop 2015-06-29 12:04:43 +03:00
Markus Makela
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
Markus Makela
5c7a30e9fe Added more error logging. 2015-06-28 10:43:06 +03:00
Markus Makela
113fb4c33b Fix to MXS-209: https://mariadb.atlassian.net/browse/MXS-209 
Added missing checks for proper column count on query result.
 2015-06-28 08:43:05 +03:00