9142 Commits

Author SHA1 Message Date
Johan Wikman
9aa4a2d1ff MXS-1512 Create parameters object from default parameters 2017-11-29 12:41:34 +02:00
Johan Wikman
7ae2acecf7 MXS-1512 Take module object type as template argument
Makes it possible to move the module object pointer into the
SpecificModule template.
2017-11-29 12:41:34 +02:00
MassimilianoPinto
8a10b72e4d Merge 2.1 in 2.2
Merge 2.1 in 2.2
2017-11-29 11:30:33 +01:00
MassimilianoPinto
ba22e3b1db MXS-154: make gtid and file MARIADB_GTID_INFO fields static
gtid and file MARIADB_GTID_INFO fields are now a fixed size
2017-11-27 18:05:13 +01:00
Esa Korhonen
23cd294dad MXS-1533: Better handling of multi-domain gtids
If the gtid_domain_pos of the master is ever modified,
gtid-variables will have multiple domains. Generally, we are
only interested in the most recent domain. This is tracked in
gtid_domain_id:s and the value of the master is used for
filtering the correct domain from all gtid-values.

Also, use gtid_current_pos instead of gtid_slave_pos. The
advantage of current_pos is that the same variable works also
for master servers. The gtid-handling is now more thorough and
detects some weird situations.
2017-11-27 16:31:13 +02:00
Esa Korhonen
15e330e127 MXS-1533: Save gtid_domain_id and server version to MySqlServerInfo
Cleaned the surrounding code, as it was querying server
version twice.
2017-11-27 16:30:43 +02:00
Esa Korhonen
8966f36b1d MXS-1545: Fix remaining compile issues 2017-11-27 16:24:05 +02:00
MassimilianoPinto
520ee35bd2 MXS-1545: fix compile issue
MXS-1545: fix compile issue
2017-11-27 15:07:06 +01:00
MassimilianoPinto
7f6b40e710 MXS-1545: Fix sequence number for blr_slave_abort_dump_request()
blr_slave_abort_dump_request() is now called with right slave->seqno
value.

Added error messaged replication stop for GTID maps reading failure
2017-11-27 10:02:26 +01:00
MassimilianoPinto
e9cf0c0f86 MXS-1545: use GTID file info in blr_binlog_file_exists
MXS-1545: use GTID file info in blr_binlog_file_exists instead of log
filename
2017-11-27 09:51:07 +01:00
Markus Mäkelä
a72956e2f3 Merge branch '2.1' into 2.2 2017-11-27 09:10:33 +02:00
Markus Mäkelä
a418804c83 Merge branch '2.0' into 2.1 2017-11-27 08:57:46 +02:00
Timofey Turenko
58984b71d8 fix paths 2017-11-27 08:37:35 +02:00
Timofey Turenko
e1711889b9 add upgrade test 2017-11-27 08:37:35 +02:00
Timofey Turenko
0c1b0648b6 add repo config file for mdbci generation 2017-11-27 08:37:35 +02:00
Timofey Turenko
6541f845ea add check for zypper and fix gpg repo sign 2017-11-27 08:37:34 +02:00
Timofey Turenko
6555fc0bab add MDBCI build scripts 2017-11-27 08:37:34 +02:00
Goltz, Immo [Extern]
b1f4d27eb1 Fix check_maxscale_resources.pl listernes parsing, close MXS-1531 2017-11-27 08:32:17 +02:00
Markus Mäkelä
098e9311c1 Update binlogrouter tutorial
Break lines at 80 characters. Add a Table of Contents and reorder sections
to have the actual tutorial part first.

Things that still need doing:

* Move limitations and other documentation to the actual router
  documentation

* Review and simplify examples
2017-11-24 14:50:07 +02:00
Markus Mäkelä
db559a9d61 Update binlogrouter documentation
Updated all examples to use parameters instead of router_options. Added a
more clear note about router_options being deprecated. Removed unnecessary
parameters from all examples.
2017-11-24 14:50:07 +02:00
Markus Mäkelä
7c21eb3ec4 Do not force router_options usage
The usage of the router_options has become optional in 2.1. This means
that the binlogrouter should not fail to start if no router_options are
defined.

Also lowered the error about master.ini to a warning as it is expected to
happen on a fresh installation.
2017-11-24 14:50:07 +02:00
MassimilianoPinto
927b4addc8 MXS-1530: check ANNOTATE_ROWS flag in connecting slave
MXS-1530: check ANNOTATE_ROWS flag in connecting slave.

In MariaDB 10.2.4 replicate_annotate_row_events and
binlog_annotate_row_events have default to ON: this change checks
whether the connecting slave is not has ANNOTATE_ROWS in
blr_slave_binlog_dump(), those ANNOTATE_ROWS events can be sent or not
to the slave.
2017-11-24 09:38:17 +01:00
Esa Korhonen
dc2286c774 MXS-1513: Obay user-given new master server
If given a readily selected master server, Switchover will use it
as the new master. If the given server is invalid, nothing will
happen and an error is returned.
2017-11-23 13:37:42 +02:00
Johan Wikman
e0818fdbeb Fix include path error 2017-11-23 12:55:24 +02:00
Markus Mäkelä
396b81f336 Fix in-source builds
The internal header directory conflicted with in-source builds causing a
build failure. This is fixed by renaming the internal header directory to
something other than maxscale.

The renaming pointed out a few problems in a couple of source files that
appeared to include internal headers when the headers were in fact public
headers.

Fixed maxctrl in-source builds by making the copying of the sources
optional.
2017-11-22 18:40:18 +02:00
Markus Mäkelä
6054fa0957 Add dependency on libmicrohttpd for maxscale-common
The core library needs to be built after libmicrohttpd.
2017-11-22 18:37:45 +02:00
Johan Wikman
c38fbd0b74 Move utility and mock classes to .../filter/test
The utility and mock classes created for the testing of dbfwfilter
will be used for testing certain aspects of the cache filter.
Consequently better to move them somewhere outside dbfwfilter.
Sofar they will be built separately for each filter.
2017-11-22 10:00:34 +02:00
Markus Mäkelä
70bf901102 Fix build failures caused by merge
A variable was not added that was used and a comparison between signed and
unsigned integers was made.
2017-11-21 16:54:24 +02:00
Markus Mäkelä
afcb708e6e Merge branch '2.1' into 2.2 2017-11-21 16:49:21 +02:00
Johan Wikman
dd699f2739 Update release date. 2017-11-21 14:36:15 +02:00
Markus Mäkelä
30e154bc6f Add missing python schema generator documentation
The documentation for the Python 3 version of the schema generator was
missing.
2017-11-20 15:22:35 +02:00
Johan Wikman
bc7209c04e cache: Update test-program due to qc-changes
In 2.2 it is no longer possible to know where a particular column
appears. Hence the result when a column appears amongst the selected
columns and the where-clause must be the same.
2017-11-20 15:21:46 +02:00
Johan Wikman
fc8c25803a cache: Perform thread initialization in test program 2017-11-20 15:19:54 +02:00
Johan Wikman
cd89b976a9 cache: Fix iteration of rules
Incrementation of index ended up outside iteration block at
earlier refactoring.
2017-11-20 15:18:17 +02:00
Johan Wikman
1c58df8307 qc_sqlite: Copy database if tables are copied
To be able to correctly report the fullname of a table we must
copy the database, if it is available.
2017-11-20 15:15:58 +02:00
Johan Wikman
604502e1cb MXS-1461 Template Module -> class Module + template SpecificModule 2017-11-20 13:14:02 +02:00
Johan Wikman
25e288b571 MXS-1461 Add firewall test cases 2017-11-20 13:14:02 +02:00
Johan Wikman
8abe5a659e MXS-1461 Allow user and host to be exluded in test cases 2017-11-20 13:14:02 +02:00
Johan Wikman
a596e1a77c MXS-1461 Move client data to Client
The user and host are now in Client.
2017-11-20 13:14:02 +02:00
Johan Wikman
083c3bcad7 MXS-1461 Rename Upstream to Client 2017-11-20 13:14:02 +02:00
Johan Wikman
a35a4c7e9f MXS-1461 Modify mock classes 2017-11-20 13:14:02 +02:00
Johan Wikman
8fba2a8049 MXS-1461 Add local firewall filter tests
Only two now, more to be added.
2017-11-20 13:14:02 +02:00
Johan Wikman
da989d636e MXS-1461 Add TempFile
Class for creating a temporary file.
2017-11-20 13:14:02 +02:00
Johan Wikman
edb271fa8e MXS-1461 Modify some mock-classes 2017-11-20 13:14:02 +02:00
Johan Wikman
843c9b0ce1 MXS-1461 Add mock Upstream class
Upstream can be used as the upstream filter of a filter to
be tested.
2017-11-20 13:14:02 +02:00
Johan Wikman
8aeb49cffa MXS-1461 Add FilterModule class 2017-11-20 13:14:02 +02:00
Johan Wikman
815da1b7ad MXS-1461 Add mock RouterSession 2017-11-20 13:14:02 +02:00
Johan Wikman
1edccba885 MXS-1461 Add mock Backend class 2017-11-20 13:14:02 +02:00
Johan Wikman
d2c80d2e91 MXS-1461 Add QueryClassifierModule 2017-11-20 13:14:02 +02:00
Johan Wikman
531a8bafbd MXS-1461 Add mock classes Session and Dcb 2017-11-20 13:14:02 +02:00