Commit Graph

3970 Commits

Author SHA1 Message Date
abd83ffbfc Merge branch 'develop' into release-1.1.1
Conflicts:
	server/modules/routing/schemarouter/schemarouter.c
2015-05-06 12:24:09 +03:00
8e4a5ce807 Moved common sharding functions to a separate file. 2015-05-06 11:59:12 +03:00
c2c318a95d Added a warning for bad boolean configuration values. 2015-05-06 11:58:58 +03:00
97c96b1141 Correct date in revision history, add to revision history for disableMasterRoleSetting. 2015-05-06 11:58:50 +03:00
066c1a3c6e Added a warning about multiple monitors monitoring the same servers. 2015-05-06 11:58:40 +03:00
cad59abbd1 Added parameters for commands and changed the execv call to execvp. 2015-05-05 22:36:47 +03:00
565eeb8f9d Merge branch 'develop' into mon_script_test 2015-05-05 18:30:08 +03:00
9b4e835434 Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop 2015-05-05 13:46:13 +03:00
9c305d95c7 Added a warning about multiple monitors monitoring the same servers. 2015-05-05 13:45:24 +03:00
9d9ebc5f67 Correct date in revision history, add to revision history for disableMasterRoleSetting. 2015-05-05 11:07:23 +01:00
8647b30184 Merge remote-tracking branch 'origin/develop' into MXS-105
Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c
2015-05-05 10:54:09 +01:00
6d89e156b3 Added a warning for bad boolean configuration values. 2015-05-04 20:26:32 +03:00
3bd03fbe09 Merge branch 'logmanager_stdout' into develop 2015-05-04 11:03:24 +03:00
c0f14dd33b Merge branch 'develop' into mon_script_test 2015-05-04 09:14:04 +03:00
463cd4a97e Moved common sharding functions to a separate file. 2015-05-04 07:06:24 +03:00
7a73182208 Merge branch 'develop' into release-1.1.1 2015-05-04 04:53:06 +03:00
c8e5df94be Fixed memory leak in query_classifier. 2015-05-03 09:58:17 +03:00
b53decb72b Fix to MXS-75: https://mariadb.atlassian.net/browse/MXS-75
COUNT(*) is no longer denied by wildcard rules.
2015-05-03 09:36:00 +03:00
d545150ceb Fix to MXS-70: https://mariadb.atlassian.net/browse/MXS-70
Added assert information to error log.
2015-05-02 05:51:25 +03:00
4cba9890fd MXS-98: https://mariadb.atlassian.net/browse/MXS-98
Added optional logging of regex filter matching to user defined file and trace log.
2015-05-01 18:54:19 +03:00
550b130d91 Schemarouter shortest session statistic now only updates session with a length of more than zero seconds. 2015-05-01 11:13:43 +03:00
2498278582 Fixed queued queries not being freed if session was closed before they could be routed. 2015-04-30 22:22:26 +03:00
e0feeac9e6 Added missing SESSION_STATE_ROUTER_READY to STRSESSIONSTATE macro. 2015-04-30 21:41:57 +03:00
56a2c24233 Added even more clarification to the non-release warning in FindMySQL.cmake 2015-04-30 12:02:06 +03:00
7c81de6633 Added a more descriptive warning when building MaxScale with source built MariaDB server. 2015-04-30 12:02:06 +03:00
23123c9781 Fixed LSB compatible init.d script missing reload functionality. 2015-04-30 12:02:06 +03:00
0dc10230de Fix to bug MXS-25
A failed master no longer generates the "Info: A Master Server is now available" message.
2015-04-30 12:02:06 +03:00
c7ed9e061d Updated Configuration Guide with a note about conflicts when multiple monitors monitor the same set of servers. 2015-04-30 12:02:05 +03:00
c3dbda9ffd Changed all atoi calls to config_truth_value when they were used to generate boolean values. 2015-04-30 12:02:05 +03:00
88da984ea3 Added even more clarification to the non-release warning in FindMySQL.cmake 2015-04-30 11:42:56 +03:00
31be62774f Added a more descriptive warning when building MaxScale with source built MariaDB server. 2015-04-30 11:39:24 +03:00
7a56be5f3d Fixed LSB compatible init.d script missing reload functionality. 2015-04-30 11:36:33 +03:00
6c904b164a Fix to bug MXS-25
A failed master no longer generates the "Info: A Master Server is now available" message.
2015-04-30 11:28:07 +03:00
bb51a6fb9d Updated Configuration Guide with a note about conflicts when multiple monitors monitor the same set of servers. 2015-04-30 11:13:49 +03:00
360db8b235 Changed all atoi calls to config_truth_value when they were used to generate boolean values. 2015-04-30 10:58:35 +03:00
416ffea9b7 Changed errmsg.sys installation location to /var/lib/maxscale 2015-04-30 10:37:06 +03:00
6e4aa9862d Fixed a segfaul caused by a null pointer in dbfwfilter rule parsing. 2015-04-30 04:52:35 +03:00
e3620eddbb Merge branch 'develop' into logmanager_stdout 2015-04-30 04:28:40 +03:00
7c988c4fd5 Removed stdout specific functions in skygw_utils and moved the logic to log_manager instead. 2015-04-30 04:26:48 +03:00
39b4928f29 Switched back to old log names for 1.1 compability. 2015-04-29 20:47:02 +03:00
00abb38689 Fixed rule parsing 2015-04-29 19:19:36 +03:00
47e5b12eb8 Added a function that frees the skygw_file_t memory but doesn't close it. 2015-04-29 18:25:35 +03:00
87133388dc Added a note to the dbfwfilter documentation about using local time. 2015-04-29 15:08:18 +03:00
c190433c7d Fixed dbfwfilter rules.
Fixed at_times not working if combined with on_queries.
2015-04-29 14:29:43 +03:00
1755706ada Master/Slave detection based on variable only
Master/Slave role setting is now based on variable value only.

Replication is checked and, if working, master_id, slave_id are saved
into server struct
2015-04-29 10:50:32 +02:00
8bff81e0a9 Fixed rule parsing failing if at_times is used with on_queries. 2015-04-29 11:39:17 +03:00
9ce225c2cb Added log manager initialization flag that prints all logs to stdout. 2015-04-29 11:20:40 +03:00
c035f4b8b7 Removed current directory from the module search path. 2015-04-29 07:03:05 +03:00
5394b4d0fa Changed standard installation directory from /usr/local/mariadb-maxscale to /usr/local. 2015-04-29 05:42:58 +03:00
398b5dfe12 Added node priorities to galeramon. The master node is selected with the lowest priority parameter in the configuration. 2015-04-28 21:32:56 +03:00