Commit Graph

1552 Commits

Author SHA1 Message Date
3992f262ca Fixed Coverity defects 2015-07-14 16:17:50 +03:00
ad369f61c6 Merge branch 'release-1.2' into MXS-230 2015-07-14 13:10:57 +03:00
a1801237a8 Fixed error messages being printed for existing directories. 2015-07-13 19:35:38 +03:00
9480c01b96 New log messages for dbusers loading failure
New log messages for dbusers loading failure
2015-07-13 18:12:34 +02:00
3ddbe47f8b Minor tidy up, including removing obsolete MUTEX_BLOCK. 2015-07-13 14:32:54 +01:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
93e557d8be Merge branch 'release-1.2' into MXS-230 2015-07-13 13:27:11 +03:00
584ad321ff Fixed possible crash. 2015-07-13 13:22:19 +03:00
ef6728344e Fixed failures to close cloned DCBs. 2015-07-13 13:11:43 +03:00
056ad50458 Merge branch 'release-1.2' into MXS-230 2015-07-13 13:08:37 +03:00
00b4d8edf5 Tidy up indentation, add folds around logging, in dcb_read. 2015-07-13 09:56:29 +01:00
a9d30b07b3 Fixed MXS-258: https://mariadb.atlassian.net/browse/MXS-258 2015-07-12 22:34:28 +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
f095ec353c Fixed config file being installed into /usr/etc instead of /etc. 2015-07-10 21:31:33 +03:00
2fe6d837fc Added null checks to hashtable functions and fixed possible crash with reload users. 2015-07-10 20:38:10 +03:00
ce0d9684d4 A few more clarifications, I hope. 2015-07-10 17:00:48 +01:00
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
015cb890d4 Reduce complexity. 2015-07-10 14:56:01 +01:00
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
bccf3d27d6 Correct name of function in debug message. 2015-07-08 16:22:09 +01:00
700576ac32 Add the DCB address to the "Not adding DCB to persistent pool" debug message. 2015-07-08 16:15:19 +01:00
ce879b65c2 Fix wrong debug message; add maxadmin info for actual max size of persistent pool. 2015-07-08 16:03:50 +01:00
ba417ef633 Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/dcb.c
2015-07-08 14:54:22 +01:00
10d690273d Resolve compiler warnings 2015-07-08 11:35:41 +01:00
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
77db46359e Change poll control failures to use SIGABRT rather than assert(false). 2015-07-08 08:52:19 +01:00
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
4c8aa02c31 Finalise comments; change abort from assert(false) to raise(SIGABRT). 2015-07-07 16:57:13 +01:00
be789855ee Add lines to revision history. 2015-07-07 16:57:12 +01:00
462c8e42ef Fix more subtle bug and expand debug message for dcb_close entry. 2015-07-07 16:57:12 +01:00
d4eff72d8a Fix stupid bug. 2015-07-07 16:57:12 +01:00
5577ef94e9 Wrap spinlock around more logic; simplify process zombies list logic. 2015-07-07 16:57:12 +01:00
9ee8d11808 Allow for DCB becoming a zombie during processing. 2015-07-07 16:57:12 +01:00
96619e2f8f Allow zombies to be submitted to dcb_close - but why does this happen? 2015-07-07 16:57:12 +01:00
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
77d374cd52 Fix mistake. 2015-07-07 16:57:12 +01:00
18a95eeb71 Simplify adding and removing DCBs from polling, improve error handling. Remove dcb_set_state functions as not adding value. 2015-07-07 16:57:12 +01:00
a72f462e2d Fixes for MXS-196 and other related problems. 2015-07-07 16:57:12 +01:00
fb09cbf100 Fixed queries being routed when the session is already closing. 2015-07-07 13:15:23 +03:00
5b75443744 Fixed module load failure referring to lib/maxscale/modules instead of lib/maxscale. 2015-07-04 09:07:37 +03:00
7e704d2312 Fixed module load failure referring to lib/maxscale/modules instead of lib/maxscale. 2015-07-04 07:13:14 +03:00
cc24777a90 Correct mkdir logic for default log directory. 2015-07-01 09:46:01 +01:00
a2e31d6846 Changed the service resource hashing function into a proper string hashing function. 2015-06-30 21:59:09 +03:00
0062d9d2b7 Version errors for SHOW SLAVE STATUS now only print once. 2015-06-29 10:24:16 +03:00
88940c0097 Fixed wildcard grants not being added to the users table. 2015-06-27 09:47:06 +03:00
4759df9f87 Added proper wildcard database grant detection. 2015-06-27 09:08:20 +03:00
03503a8f9b Fix a number of relatively simple bugs shown by Coverity. 2015-06-26 17:31:58 +01:00
cff01cad05 Fixed compile errors with old SSL library. 2015-06-25 17:13:10 +03:00
80709ce039 Fixed compile errors for older SSL libraries. 2015-06-25 16:46:26 +03:00