3b29e1a1f0
Fixed merging conflicts.
2015-02-24 06:34:22 +02:00
9e7afeb302
Merge branch 'develop' into MAX-324
...
Conflicts:
macros.cmake
server/core/config.c
server/core/service.c
server/modules/routing/CMakeLists.txt
2015-02-24 06:26:55 +02:00
5477cdf5eb
Renamed the dbshard module to schemarouter.
2015-02-24 05:49:38 +02:00
c47d2f3791
Added session timeouts.
...
The parameter 'connection_timeout' for services takes a value as seconds.
All sessions that have been idle for longer than this will be disconnected.
2015-02-20 22:16:43 +02:00
fc969acc73
Added optional stripping of escape characters from database names when laoding users.
2015-02-20 21:07:12 +02:00
ea55572ab8
Merge branch 'develop' into MAX-324
2015-02-20 04:45:48 +02:00
65e2572ad0
Made config_truth_value non-static.
2015-02-18 13:16:06 +02:00
03456b931b
Added "yes" and "no" to the config truth value check and added the function to the header.
2015-02-18 11:45:01 +02:00
46ec9abe29
Added optional parameters for services that allow all servers to be used when building the list of users.
2015-02-09 07:19:13 +02:00
8791cc455e
Added the initial implementation of the shardrouter module.
2015-01-23 06:40:30 +02:00
fed828eb29
Merge branch 'release-1.0GA' into MAX-324
...
Conflicts:
server/MaxScale_template.cnf
server/core/service.c
2015-01-06 04:45:30 +02:00
f861d67b7f
Removed all references to use_sql_variables_in variable where it is used in dbshard.
...
Commented out dead code.
Fixed some indentations.
2014-12-16 14:14:57 +02:00
69e131e9c4
Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324
2014-12-15 22:10:36 +02:00
7fed679f40
poll.c:poll_add_event_to_dcb did not increase the pollStats.evq_pending counter which caused it to go negative, which, inturn caused all threads to spinloop with minimal timeout.
2014-12-15 22:09:23 +02:00
319b9150dc
Fixed missing ignore_databases causing a false warning.
2014-12-15 16:24:18 +02:00
a91845b324
Re-enabled the ignore list, it uses the parameter 'ignore databases=<list of db names>'.
...
Added routing of trivial queries and ignored databases to the first available backend.
2014-12-13 07:47:46 +02:00
2a623c6ec3
Fixed a typo in config.c
2014-12-10 18:05:58 +02:00
bc104c0ef1
Merge branch 'release-1.0GA' into MAX-324
2014-12-08 22:37:15 +02:00
4c1ed65617
Added dbshard template to MaxScale_template.cnf
...
Added NULL-check to createInstance to avoid NULL-pointer reference if user/pwd is missing from config.
Removed unnecessary code, added error messages, fixed intendation.
2014-12-07 23:34:47 +02:00
1e5bc37780
Use strtok_r rather than strtok
2014-12-03 09:33:55 +00:00
d3c8770852
Merge branch 'blr' into develop
...
Conflicts:
client/maxadmin.c
server/core/CMakeLists.txt
server/core/dcb.c
server/core/gateway.c
server/core/poll.c
server/core/test/CMakeLists.txt
server/core/test/makefile
server/include/poll.h
server/modules/routing/debugcmd.c
2014-11-19 12:00:55 +00:00
fd11e6a7f5
Session-specific logging. Added functions
...
void session_enable_log(SESSION* ses, logfile_id_t id)
and
void session_disable_log(SESSION* ses, logfile_id_t id)
Which switch specific log type on/off if the log type in question is not generally enabled.
Each thread carries a thread-specific struct log_info_t which includes members for current session id and bitfield for enabled log types for the current session. That information is checked before actual log write functions are called.
Each file where session-specific logging is used, must include the following exports:
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
2014-11-19 00:08:59 +02:00
9cb2be9605
Fixes to Coverity erros 75748 and 76132.
2014-11-11 13:42:12 +02:00
39cc701b0d
Branch update
...
Branch update
2014-11-07 16:59:01 +01:00
3b982ae820
Added monitor timeouts for connect/read/write
...
Added monitor timeouts for connect/read/write
2014-11-07 16:45:06 +01:00
a4caac55c8
Fixes to Coverity errors:
...
72662
72702
72724
73397
73410
73414
73422
75424
75748
75789
75938
75939
Also includes a fix to a bug caused by a previous Coverity error change in canonizer.c
2014-11-07 11:52:40 +02:00
474f018cee
Fixes to minor Coverity errors:
...
75424
73422
72724
72702
72662
2014-11-07 11:12:26 +02:00
17f87e29af
Fixes to some Coverity issues.
2014-11-05 11:57:42 +02:00
6f22975e6c
Added 'disable_master_failback' monitor option
...
Added 'disable_master_failback' option in Galera monitor
2014-10-30 19:03:07 +01:00
e729a17fd4
Addition of new tuning parameters for epoll spins and wait time
2014-10-17 12:28:27 +01:00
4acd85cf82
Add missing trim() call to the server list code for monitors
2014-10-15 13:26:00 +01:00
ebb3b52fdb
Included the my_config.h header before any system headers if mysql headers were used.
2014-10-10 12:30:21 +03:00
e17607b0d3
Minor changes to tests; fix typo; tidy up.
2014-10-03 17:24:46 +01:00
b0683d9b4d
Updated the licensing year from 2013 to 2013-2014
2014-10-01 14:37:12 +03:00
f4e591e382
Changed 'SkySQL Gateway' to 'MariaDB Corporation MaxScale'
2014-09-30 13:15:03 +03:00
c344231f80
Renamed all occurences of SkySQL to MariaDB Corporation
2014-09-30 13:02:10 +03:00
c4fb3e490b
Bug 546 - use of weghtby causes entry in error log
2014-09-19 15:52:44 +01:00
7b115fed2b
merge branch MAX-252 for bug-524
...
merge branch MAX-252 for bug-524
2014-09-12 17:41:37 +02:00
7108add6f5
code cleanup localhost_match_wildcard_host
...
code cleanup for localhost_match_wildcard_host
2014-09-12 17:21:34 +02:00
46c4808c79
Bug 494 - remove error log report for missing servers for debugcli and cli router
2014-09-12 15:45:10 +01:00
8818f23176
Added localhost_match_wildcard_host parameter
...
Added localhost_match_wildcard_host parameter to service
2014-09-12 16:24:55 +02:00
3bb614d9eb
brand release-1.0beta-refresh merged
...
brand release-1.0beta-refresh merged
2014-09-12 16:00:36 +02:00
7069ee2549
Added checks to determine if servers in the servers= lists for services and
...
monitors exist in the configuration file.
2014-09-12 12:16:39 +01:00
8b5b4a17fe
Merge from Z3
...
Merge from Z3
2014-09-11 12:51:16 +02:00
7245d1baa1
blr branch merge
...
blr branch merge
2014-09-11 12:20:42 +02:00
f15815c6bb
New service parameter localhost_match_any
...
New service parameter ‘localhost_match_any’ allows localhost matching
the wildcard host.
Default value is 0, don’t match.
It may be changed if backend servers don’t have the anonymous user
‘’@localhost
2014-09-10 17:12:25 +02:00
025f920ddb
Replaced RWSplit parameters write_ses_variables_to_all and read_ses_variables_from_slaves with
...
use_sql_variables_in=[master|all] (default all)
Modified MaxScale Configuration And Usage Scenarios-Z3.pdf and MaxScale_template.cnf accordingly.
Fixed typo in server/modules/routing/readwritesplit/test/rwsplit.sh
2014-09-10 11:32:53 +03:00
f74493d922
server/modules/filter/Makefile: Fixed problem which prevented cleaning and compiling hintfilter library.
...
server/core/config.c: Removed unused if..else block from config_get_valint. Changed it also to return value which indicates whether the operation succeed. Added config_get_valbool similar to config_get_valint.
service.c:Added typelib-like struct and array of valid boolean values. Fixed parameter type test in service_set_param_value. Completed boolean type parameter handling.
hintparser.c:Fixed error message for non-maxscale hints.
readwritesplit.c:Added loading of configuration parameters from service to instance and from instance to each new session. Fixed routing condition in get_route_target. Modified get_route_target so that it takes also rw_read_sesvars_from_slaves and rw_write_sesvars_to_all as parameters.
skygw_types.h: added array size counting macro.
2014-09-08 21:44:23 +03:00
92889ad216
config.c: Added configuration parameter processing for read_ses_variables_from_slaves and for write_ses_variables_to_all . The values are read from config file, qualified and stored to service. Values are loaded when instance is created. This is limitation in current implementation and will change so that configuration is dynamically changeable.
2014-09-07 23:48:16 +03:00
a4ae7ea139
Fix for bug 493 - Multiple config file sections with the same name
2014-09-01 17:18:15 +01:00
