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

2238 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
ad369f61c6 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +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
a1801237a8 Fixed error messages being printed for existing directories. 2015-07-13 19:35:38 +03:00
counterpoint
3ddbe47f8b Minor tidy up, including removing obsolete MUTEX_BLOCK. 2015-07-13 14:32:54 +01: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
93e557d8be Merge branch 'release-1.2' into MXS-230 2015-07-13 13:27:11 +03:00
Markus Makela
584ad321ff Fixed possible crash. 2015-07-13 13:22:19 +03:00
Markus Makela
ef6728344e Fixed failures to close cloned DCBs. 2015-07-13 13:11:43 +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
counterpoint
00b4d8edf5 Tidy up indentation, add folds around logging, in dcb_read. 2015-07-13 09:56:29 +01:00
Markus Makela
a9d30b07b3 Fixed MXS-258: https://mariadb.atlassian.net/browse/MXS-258 2015-07-12 22:34:28 +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
Markus Makela
f095ec353c Fixed config file being installed into /usr/etc instead of /etc. 2015-07-10 21:31:33 +03:00
Markus Makela
2fe6d837fc Added null checks to hashtable functions and fixed possible crash with reload users. 2015-07-10 20:38:10 +03:00
counterpoint
ce0d9684d4 A few more clarifications, I hope. 2015-07-10 17:00:48 +01: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
counterpoint
015cb890d4 Reduce complexity. 2015-07-10 14:56:01 +01:00
Markus Makela
af6e010ba1 Added missing namedserverfilter documentation. 2015-07-10 13:51:32 +03:00
Markus Makela
b0e98bc420 Added template cnf file to /etc and renamed folders. 2015-07-09 14:41:23 +03:00
counterpoint
8376bbf3e6 Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location. 2015-07-09 08:37:20 +01:00
counterpoint
bccf3d27d6 Correct name of function in debug message. 2015-07-08 16:22:09 +01:00
counterpoint
700576ac32 Add the DCB address to the "Not adding DCB to persistent pool" debug message. 2015-07-08 16:15:19 +01:00
counterpoint
ce879b65c2 Fix wrong debug message; add maxadmin info for actual max size of persistent pool. 2015-07-08 16:03:50 +01: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
counterpoint
4cea1b68c0 Simplify logic in processing of zombies list, to bring more into line with develop branch and reduce conflicts when merged. 2015-07-08 09:26:21 +01:00
counterpoint
77db46359e Change poll control failures to use SIGABRT rather than assert(false). 2015-07-08 08:52:19 +01: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
462c8e42ef Fix more subtle bug and expand debug message for dcb_close entry. 2015-07-07 16:57:12 +01:00
counterpoint
d4eff72d8a Fix stupid bug. 2015-07-07 16:57:12 +01:00
counterpoint
5577ef94e9 Wrap spinlock around more logic; simplify process zombies list logic. 2015-07-07 16:57:12 +01:00
counterpoint
9ee8d11808 Allow for DCB becoming a zombie during processing. 2015-07-07 16:57:12 +01:00
counterpoint
96619e2f8f Allow zombies to be submitted to dcb_close - but why does this happen? 2015-07-07 16:57:12 +01:00