Commit Graph

12292 Commits

Author SHA1 Message Date
8a570eb6a1 MXS-2205 Combine maxscale/monitor.h with maxscale/monitor.hh 2018-12-03 15:28:06 +02:00
97bb7e7e1a MXS-2205 Combine maxscale/modutil.h with maxscale/modutil.hh 2018-12-03 15:28:06 +02:00
49173bbe83 Merge branch '2.3' into develop 2018-12-03 15:21:24 +02:00
1f495dec99 Merge branch '2.3.2' into 2.3 2018-12-03 15:20:33 +02:00
cd95ca7092 Update 2.3.2 release date 2018-12-03 14:51:40 +02:00
35cdbc7220 MXS-2205 Convert modulecmd.h to .hh 2018-12-03 14:06:02 +02:00
3e5818fcb6 MXS-2205 Convert mysql_utils.h to .hh 2018-12-03 14:05:21 +02:00
1701f87f00 MXS-2205 Convert internal/maxscale.h and internal/dcb.h to .hh 2018-12-03 13:49:08 +02:00
cdf323384c MXS-2205 Combine internal/session.h with internal/session.hh 2018-12-03 13:47:39 +02:00
36792607d8 MXS-2205 Combine internal/modules.h with internal/modules.hh 2018-12-03 13:36:25 +02:00
b15f43bc81 MXS-2205 Convert config_runtime.h and externcmd.h to .hh 2018-12-03 13:34:33 +02:00
344c7dde4a MXS-2205 Combine internal monitor headers
Contents of monitor.h moved to monitor.hh
2018-12-03 13:32:09 +02:00
0f755adc78 MySQLAuth header to .hh 2018-12-03 11:00:29 +02:00
760f2ff34c Move alloc.cc to maxbase
Only renames the functions. Macro names are left as is to keep the diff
small.
2018-12-03 10:20:45 +02:00
0c7e737eb7 Move some mysql/mariadb utilities to maxutils
Can be used in system tests later on.
2018-11-30 13:03:37 +02:00
a6fe6a0463 Delete internal/worker.h
Was unused.
2018-11-30 12:22:51 +02:00
01e9f71af1 MXS-2197: Make SERV_LISTENER a C++ class
The class is still mostly the same as the old C version but it now uses
std::string instead of char pointers. Changed configuration default values
so that the parameters passed to the listener allocation are always valid.
2018-11-30 12:15:57 +02:00
77585bdb8c MXS-2197: Make config.h and service.h C++ headers
This is the first step into converting the other headers into C++.
2018-11-30 12:15:57 +02:00
fb533df22e MXS-2197: Compile all cache parts as C++
This is required if all headers are converted into C++ as it includes
MaxScale headers.
2018-11-30 12:15:57 +02:00
cc52ffe768 MXS-2197: Remove C examples
The examples are obsolete.
2018-11-30 12:15:57 +02:00
3cb3676f3e Clean up CCRFilter
Rearranges code, renames fields, uses string instead of const char etc.
2018-11-30 12:12:21 +02:00
7d4f0483a9 Use filter template in CCRFilter
Minimal changes for now, cleanup in next commit.
2018-11-30 12:12:21 +02:00
d07bc9cd7c Merge branch '2.3' into develop 2018-11-30 12:06:11 +02:00
6f934cb9d4 Merge branch '2.3.2' into 2.3 2018-11-30 12:05:29 +02:00
95d8ee9305 Extend maxctrl system test
The test now executes all commands present in MaxCtrl.
2018-11-30 12:05:14 +02:00
17d46d9166 Compile maxkeys and maxpasswd as C++ 2018-11-30 10:59:32 +02:00
a1e1ac0012 Move string_printf to maxbase
Can be used in tests.
2018-11-29 12:21:40 +02:00
1126c687a4 Fix alloc-dealloc mismatch in qc_classify_as_json
The deleter for std::unique_ptr<GWBUF> was not included in that file which
caused it to be deleted with the default deleter. The same should apply to
std::unique_ptr<json_t> as well.
2018-11-29 11:25:28 +02:00
9b571566aa Fix crash in maxadmin show filter 2018-11-28 19:34:18 +02:00
7331549915 MXS-2188: Update target table in prepare_table
Passing the target table and create to the prepare_table function allows
the converter to update the internal variables.
2018-11-28 19:32:52 +02:00
1802151c62 Fix blr server protocol name
The server that the binlogrouter creates used the old protocol name that
caused a confusing deprecation warning.
2018-11-28 19:32:31 +02:00
3047b8b4cf Fix dependency installation script
The script generates files owned by root so it needs to be removed with
sudo. As the removal of the directory is the last command, its failure
causes the script to fail.
2018-11-28 19:32:31 +02:00
2dc6718d47 MXS-2188: Update target table in prepare_table
Passing the target table and create to the prepare_table function allows
the converter to update the internal variables.
2018-11-28 19:21:59 +02:00
2eee524eef Fix blr server protocol name
The server that the binlogrouter creates used the old protocol name that
caused a confusing deprecation warning.
2018-11-28 19:21:59 +02:00
70c8942a62 Fix dependency installation script
The script generates files owned by root so it needs to be removed with
sudo. As the removal of the directory is the last command, its failure
causes the script to fail.
2018-11-28 19:21:58 +02:00
dbe9e0c471 MXS-2163 Some minor refactoring
- Name constants and functions consistently.
- Factor out common functionality.
- Address review comments.
2018-11-28 15:27:23 +02:00
55a39268c6 MXS-2163 Make MariaDBMon recognize Clustrix
To allow MariaDBMon to be used with Clustrix we need to handle
Clustrix separately as its apparent version is 5.0.45, which is
lower than what MariaDBMon supports. Further, we must ensure that
Clustrix does not query the slave status as there are no slaves
in the M/S sense in a Clustrix cluster.

NOTE: Once there is a specific Clustrix monitor, this code should
be removed.
2018-11-28 15:27:23 +02:00
a4d073ec56 MXS-2163 If clustrix do not "use mysql" 2018-11-28 15:27:23 +02:00
31fdf37555 MXS-2163 Add Clustrix users query 2018-11-28 15:27:23 +02:00
194e751fb2 MXS-2163 Add function for checking Clustrix table permissions 2018-11-28 15:27:23 +02:00
79db52c30e MXS-2163 Factor out table permission check
In the case of Clustrix the check must target different tables,
so a separate function will then be provided for that.
2018-11-28 15:27:23 +02:00
2b64ce98cc Merge branch '2.3' into develop 2018-11-28 15:27:00 +02:00
0c973c1481 Update maintenance version 2018-11-28 14:39:15 +02:00
8f0a85fd46 2.3.2 is GA 2018-11-28 14:34:54 +02:00
2b25f8522f Update 2.3 changelog and 2.3.2 release notes 2018-11-28 14:26:15 +02:00
f9a5a9a38d Merge branch '2.3' into develop 2018-11-28 13:12:27 +02:00
1d91895f41 Fix switchover_auto and rejoin_bad tests
Increased some timeouts which were a bit too short in some cases. Cleaned up
the tests too.
2018-11-28 13:08:49 +02:00
76c82134a1 Merge branch '2.3' into develop 2018-11-28 11:31:09 +02:00
cf66cc6968 Merge branch '2.2' into 2.3 2018-11-28 11:27:44 +02:00
590e489be0 Merge branch '2.2.17' into 2.2 2018-11-28 11:23:47 +02:00