c82831cc10
Fix merge conflict
...
An old define name caused the build to fail.
2017-02-08 09:29:26 +02:00
67888f3596
Merge branch '2.0' into 2.1.0
2017-02-08 09:27:00 +02:00
c0f5124f6f
Fix field name parsing in avrorouter
...
The backtick was copied to the field name and converted to an underscore
when the name was transformed into a valid Avro identifier. This caused
one extra character to appear in the field name in the Avro schema files.
2017-02-06 16:35:40 +02:00
869e6ac950
Remove useless maxadmin commands
...
The commands did nothing.
2017-02-06 10:29:10 +02:00
a5a579ffce
Rename BUILD_AVRO to BUILD_CDC
...
Using the broader CDC name instead of AVRO for the CMake variable name
makes more sense as there are modules other than the avrorouter.
2017-02-03 14:39:56 +02:00
6ee257dc5f
Only log an error if the binlog file exists
...
The avrorouter logged an error every time it tried to open a file even if
the file doesn't exist.
2017-02-03 08:16:12 +02:00
e64a641bcd
Merge branch '2.0' into develop
2017-02-01 09:35:13 +02:00
122027e4a3
Fix binlogrouter test
...
The test used the wrong working directory. blr_slave.c didn't check the
input for NULL values.
2017-01-30 16:46:24 +02:00
7dc5698c90
Rename domain to module
...
The module commands now use the module name as the replacement for
domain. The domain itself wasn't any better when compared to the module
name.
2017-01-28 10:09:34 +02:00
e8c53e8aa5
Fix authenticator path in testbinlog.c
...
Added missing subdirectories in library path
2017-01-27 15:12:06 +01:00
1f9b18e3bc
Split secrets.h to public and core + miscellaneous cleanup
...
Also, changed some function names to this_style from thisStyle. More of
this in later commits.
2017-01-27 15:33:52 +02:00
50cffed5b2
Add readwritesplit options to diagnostic output
...
This helps detect the state of the loaded configuration.
2017-01-27 12:19:27 +02:00
8a1a4c91e4
Enable disable_sescmd_history
by default
...
The combination of the default values of `disable_sescmd_history=false`
and `max_slave_connections=100%` does not make sense as it is not possible
to find a replacement slave in case an active one fails.
2017-01-27 12:19:27 +02:00
8b83bf834e
Clean up router.h
...
Nothing moved to core, just rename and cleanup.
2017-01-26 16:14:17 +02:00
74225daf46
Remove memlog and rdtsc
...
Neither of these were actively used, so they and any associated tests
were removed.
2017-01-26 13:16:51 +02:00
8d07604436
Split maxscale.h to public and private parts
...
This header defines some general functions and maxscale main() return
values. Most of it is still public, but there were some functions
which were moved to a core header.
2017-01-26 11:17:25 +02:00
84040be182
Add missing error handling to Avro file handling
...
Some of the JSON errors weren't handled which could cause problems when a
malformed schema definition is read.
Also added more error messages for situations when opening of the files
fails.
2017-01-26 10:23:26 +02:00
3378edc4d3
Route COM_SET_OPTION to all servers
...
This fixes problems with multi-statement execution which is only enabled
when the corresponding option is present.
2017-01-26 09:57:29 +02:00
aa8851fbe1
Remove listmanager
...
The file wasn't used, so any traces of listmanager.h or .c have been
erased.
2017-01-25 16:11:12 +02:00
7d51864402
Clean config.h some more
...
Moved some typedefs to router.h and server.h, changed a few
constants to these enums. Renamed some types in config.h to
remove "Gateway".
There are still some functions in the public header which are
only used in core, but they seem to fit the theme of public functions
so were not moved.
2017-01-25 16:05:51 +02:00
b923589222
Fix relaxed multi-statement mode
...
The relaxed mode for multi-statements wasn't working as it required the
configuration to be enabled.
2017-01-25 15:39:10 +02:00
a1f54366c0
Fix compilation error
...
Fix compilation error
2017-01-25 14:27:21 +01:00
be7344f747
MXS-185: "read-only" transactions detected in readwritesplit handleError
...
handleError can detect READ ONLY transaction set when problem_dcb ==
rses->forced_node->bref_dcb.
Session will be closed and rses->forced_node set to NULL
2017-01-25 12:58:10 +01:00
b23d3e6198
MXS-185: "read-only" transactions to be directed to the slaves by the readwritesplit router
...
START TRANSACTION READ ONLY
statements
COMMIT
All statements, including START … and COMMIT are routed to same slave
server
2017-01-25 11:43:17 +01:00
b187afdcf4
Move config_runtime.h and externcmd.h to core
...
+ some cleanup
2017-01-24 13:05:21 +02:00
8cffa4ad58
Divide poll.h to core and public headers
...
Also some cleanup of other headers.
2017-01-20 17:15:27 +02:00
6e38276a20
Rename files, removing "gw"-prefix
...
Also gwdirs.h.in -> paths.h.in
2017-01-20 12:55:52 +02:00
eff34b91fb
Move modules.h to core/maxscale
...
Also remove some unnecessary includes + cleanup
2017-01-19 15:53:25 +02:00
53c5b475ad
More cleanup of monitor.h
...
Move some more functions into core header + miscellaneous cleanup
2017-01-19 15:32:40 +02:00
02a8f7492e
Divide session.h to internal and interface headers
...
Definitions and function used by core are in
server/core/maxscale/session.h
Definitions and function used by plugins are in
include/maxscale/session.h
2017-01-19 15:19:40 +02:00
8aa76727d2
Remove explicit long indicator of size defines
2017-01-19 10:42:05 +02:00
00f77bbe69
Fix some leftovers from the SESSION->MXS_SESSION and related renames
...
Renames only.
2017-01-18 11:50:52 +02:00
16a76fcd28
Rename qc_get_type() to qc_get_type_mask()
...
To make it plain that it is a mask that is returned and not a
specific value from the enum qc_query_type_t.
2017-01-18 08:34:53 +02:00
5fc7b277da
Change SESSION to MXS_SESSION
...
Some modules didn't use the new MXS_SESSION structure.
2017-01-18 08:31:47 +02:00
fb771c8a2e
Rename public types and constants in session.h
...
Preparing to split session.h into module and core sections.
2017-01-17 16:30:14 +02:00
680401cf8e
Rename public types and constants in monitor.h
...
Preparing to split monitor.h into module and core sections. Also
changed a few comments in monitor.h.
2017-01-17 15:47:13 +02:00
a48be9badf
Format router modules
...
Formatted router modules with Astyle.
2017-01-17 14:48:43 +02:00
5b92a1f467
Remove explicit module name from log messages
...
The module name doesn't need to be logged as MXS_MODULE_NAME will be
automatically added as a prefix to all messages logged by the module.
2017-01-17 12:51:08 +02:00
2cabcea211
Add definitions of MXS_MODULE_NAME to all modules
...
All modules now declare a name for the module. This is name is added as a
prefix to all messages logged by a module. The prefix should help
determine which part of the system logs a message.
2017-01-16 11:28:34 +02:00
d054bc9b04
Split config.h into external and internal parts
...
The external config.h header defined functions and structures that are
intended to be used by modules. The internal header contains functions
that are used only by the MaxScale core.
2017-01-16 11:02:34 +02:00
60d4e17996
Allow restriction of module command arguments
...
The module commands now support an optional flag for arguments that when
enabled checks that the argument module name matches the registered domain
name. This can be used to enforce argument type validity for arguments
that are given to modules that expect objects of a certain type.
For example, this is used by the cache and dbfwfilter to prevent valid
filters but of the wrong type being given as arguments.
2017-01-13 15:28:36 +02:00
265e5c0593
Rename FILTER_DEF to MXS_FILTER_DEF
...
Provide functions that allows the actual definition of MXS_FILTER_DEF
to be made private.
2017-01-13 14:30:11 +02:00
2fa12f796b
Rename MYSQL_GET_PACKET_LEN to MYSQL_GET_PAYLOAD_LEN
...
The function returns the length of the payload, not the length of
the entire packet.
2017-01-12 14:24:14 +02:00
77aff88ed7
Maxbinlogcheck gets stuck when binlog file is not existant/readable
...
Missing exit() caused maxbinlogcheck being stuck on log_manager call
when specified binlog file is not existed/redable
2017-01-11 15:30:57 +01:00
73a1388468
Check and create binlogdir and avrodir before use
...
The binlog and avro file directories should be checked before they are
used and if they don't exist, they should be created.
2017-01-10 16:52:29 +02:00
c06a95ff92
Use module parameters in binlogrouter
...
The binlogrouter accepts all router options also as parameters.
2017-01-10 16:52:29 +02:00
45e26c63a5
Fix for bref_cmp_current_load() algorithm.
...
Fix for bref_cmp_current_load() algorithm when weight is present
2017-01-10 12:02:16 +01:00
f32471d1cb
Fix for operations used instead of connections
...
Fix for operations used instead of connections in
bref_cmp_current_load()
2017-01-10 12:02:16 +01:00
a60a0032d1
Server weight is taken into account for LEAST_BEHIND_MASTER selection criteria
...
Server weight is taken into account for LEAST_BEHIND_MASTER selection
criteria
2017-01-10 12:02:16 +01:00
56ecdc219b
Refactor config.c functions for testing
...
To test the configuration validation and default value generation, the
functions needed to be refactored to allow parameters to be passed
directly to the function.
2017-01-09 14:17:33 +02:00