Commit Graph

30 Commits

Author SHA1 Message Date
5d4fe65b19 Fixed some misaligned brackets. 2015-11-16 21:00:22 +02:00
6dea82631d Galeramon formatting changes
Fixed indentation, bracket alignment and other minor things.
2015-11-16 13:59:47 +02:00
6b88b6b17f Merge branch 'develop' into MXS-329-develop-20151111 2015-11-13 07:48:59 +02:00
5efd564573 Fix to MXS-288: https://mariadb.atlassian.net/browse/MXS-288 Added MySQL 5.7 authentication
The change to the mysql.user table in MySQL 5.7 caused MaxScale to stop
working with it. This commit adds functionality that checks which version of
the user data query should be made. It also moves common code related to
server version strings to server.c
2015-11-12 15:24:27 +02:00
466224b316 Moved common monitor code to externcmd.c
File existence and permission checks are now done in externcmd_can_execute
2015-11-11 21:19:07 +02:00
dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111
# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.
2015-11-11 11:08:02 +00:00
834a88aeda Log variables moved to log_manager.h
The log manager variables lm_enabled_log_files_bitmask, log_ses_count
and tls_log_info that earlier were declared separately in every
c-file are now declared in the log_manager.h header.
2015-11-04 14:26:53 +02:00
91bb3b288c Moved common monitor code to monitor_common.c 2015-10-26 17:31:19 +02:00
6040f11070 Include DCB headers to remove warnings. 2015-10-17 20:06:37 +01:00
482db5e84d User friendly bit mask display for DCB print; monitors to work via inserting hangups instead of callbacks. 2015-10-17 20:00:05 +01:00
c001e030af Fixed available_when_donor not working properly. 2015-08-20 20:33:46 +03:00
19fe7127d5 Added galeramon server priorities. 2015-07-13 14:39:04 +03:00
2580738509 Merge branch 'develop' into priority_galeramon 2015-07-07 20:45:54 +03:00
6f343ff57b Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227
Fixed memory leak.
2015-06-29 19:17:12 +03:00
5c7a30e9fe Added more error logging. 2015-06-28 10:43:06 +03:00
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
e5d9abbdcb Fixes to Coverity defects. 2015-06-25 06:01:33 +03:00
3fb1213dee Added more error logging when monitor scripts fail. 2015-06-10 06:09:42 +03:00
3301ffc76d Added different log message when the script is missing for a monitor. 2015-05-21 17:40:33 +03:00
91bc7b2792 Added missing spinlock calls to all monitors. 2015-05-21 11:41:11 +03:00
7dbc021149 Added more logging when a monitor script cannot be executed. 2015-05-20 16:16:49 +03:00
c4f51c0b8c Fixed a possible bug with multiple monitors monitoring the same servers. 2015-05-19 15:42:11 +03:00
b94f494d80 Added filtering of monitor events. 2015-05-14 12:05:58 +03:00
1aba13177b Added ndbclustermon and mmmon headers. 2015-05-11 20:35:54 +03:00
9845923f81 Added full implementation of MXS-121 to all monitors. 2015-05-09 17:37:34 +03:00
0c15812340 Moved common functions to monitor_common.c 2015-05-09 14:29:26 +03:00
8af302d785 Removed unused variables from monitors. 2015-05-09 14:19:25 +03:00
49d5409dcb Merge branch 'develop' into MXS-121
Conflicts:
	server/modules/monitor/mysql_mon.c
2015-05-09 04:49:06 +03:00
5a3ed0de9b Moved common monitor functionality to the MONITOR type
Common variables, like databases, timeouts and interval, and functionality was moved to the MONITOR type.
This reduces the redundant functionality of the monitor API's functions like registerServer and setInterval.
2015-05-09 04:47:17 +03:00
da6d597987 Moved common monitor structures and definitions to a separate header and added master down script to galeramon. 2015-05-07 05:56:13 +03:00