Merge branch '2.4.15' into 2.4

Documentation/Release-Notes/MaxScale-2.4.15-Release-Notes.md

@@ -1,4 +1,4 @@
-# MariaDB MaxScale 2.4.15 Release Notes
+# MariaDB MaxScale 2.4.15 Release Notes -- 2021-01-21
 
 Release 2.4.15 is a GA release.
 
@@ -15,6 +15,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
 ## Bug fixes
 
 * [MXS-3360](https://jira.mariadb.org/browse/MXS-3360) MaxCtrl option --authenticator-options doesn't work
+* [MXS-3346](https://jira.mariadb.org/browse/MXS-3346) When using --basedir, mysql/plugin dir needs to be writable
 * [MXS-3337](https://jira.mariadb.org/browse/MXS-3337) galeramon queries only status, not variables
 * [MXS-3326](https://jira.mariadb.org/browse/MXS-3326) Host class does not accept all valid domain names.
 * [MXS-3325](https://jira.mariadb.org/browse/MXS-3325) Redis cache storage does not accept dashes in server names.

cmake/install_layout.cmake

@@ -23,7 +23,7 @@ set(DEFAULT_EXEC_SUBPATH "${MAXSCALE_BINDIR}" CACHE PATH "Default executable sub
 set(DEFAULT_CONFIG_SUBPATH "etc" CACHE PATH "Default configuration subpath")
 set(DEFAULT_CONFIG_PERSIST_SUBPATH "maxscale.cnf.d" CACHE PATH "Default persisted configuration subpath")
 set(DEFAULT_MODULE_CONFIG_SUBPATH "${DEFAULT_CONFIG_SUBPATH}/maxscale.modules.d" CACHE PATH "Default configuration subpath")
-set(DEFAULT_CONNECTOR_PLUGIN_SUBPATH "/mysql/plugin" CACHE PATH "Default connector plugin subpath")
+set(DEFAULT_CONNECTOR_PLUGIN_SUBPATH "${CMAKE_INSTALL_LIBDIR}/mysql/plugin" CACHE PATH "Default connector plugin subpath")
 
 set(DEFAULT_PIDDIR ${MAXSCALE_VARDIR}/${DEFAULT_PID_SUBPATH} CACHE PATH "Default PID file directory")
 set(DEFAULT_MAXADMIN_SOCKET ${DEFAULT_PIDDIR}/${DEFAULT_MAXADMIN_SOCKET_FILE} CACHE PATH "Default MaxAdmin socket path")
@@ -36,7 +36,7 @@ set(DEFAULT_EXECDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_EXEC_SUBPATH} CACHE PATH "
 set(DEFAULT_CONFIGDIR /${DEFAULT_CONFIG_SUBPATH} CACHE PATH "Default configuration directory")
 set(DEFAULT_CONFIG_PERSISTDIR ${DEFAULT_DATADIR}/${DEFAULT_CONFIG_PERSIST_SUBPATH} CACHE PATH "Default persisted configuration directory")
 set(DEFAULT_MODULE_CONFIGDIR /${DEFAULT_MODULE_CONFIG_SUBPATH} CACHE PATH "Default module configuration directory")
-set(DEFAULT_CONNECTOR_PLUGINDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${DEFAULT_CONNECTOR_PLUGIN_SUBPATH} CACHE PATH "Default connector plugin directory")
+set(DEFAULT_CONNECTOR_PLUGINDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_CONNECTOR_PLUGIN_SUBPATH} CACHE PATH "Default connector plugin directory")
 
 # Massage TARGET_COMPONENT into a list
 if (TARGET_COMPONENT)

cmake/package.cmake

@@ -82,6 +82,8 @@ endif()
 find_program(RPMBUILD rpmbuild)
 find_program(DEBBUILD dpkg-buildpackage)
 
+option(TARBALL "Build a tarball package" OFF)
+
 if(TARBALL)
   include(cmake/package_tgz.cmake)
 

cmake/package_tgz.cmake

@@ -25,6 +25,7 @@ install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxs
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale/maxscale.cnf.d)
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION etc/maxscale.modules.d)
 install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/plugin)
+install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION ${DEFAULT_CONNECTOR_PLUGIN_SUBPATH})
 
 if(DISTRIB_SUFFIX)
   set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}")

maxctrl/lib/core.js

@@ -46,7 +46,7 @@ program
         alias: 'hosts',
         describe: 'List of MaxScale hosts. The hosts must be in ' +
             'HOST:PORT format and each value must be separated by a comma.',
-        default: 'localhost:8989',
+        default: '127.0.0.1:8989',
         type: 'string'
     })
     .option('t', {

server/core/gateway.cc

@@ -1403,9 +1403,9 @@ bool set_runtime_dirs(const char* basedir)
 
     if (rv && (rv = handle_path_arg(&path,
                                     basedir,
-                                    "var/" MXS_DEFAULT_CONNECTOR_PLUGIN_SUBPATH,
+                                    MXS_DEFAULT_CONNECTOR_PLUGIN_SUBPATH,
                                     true,
-                                    true)))
+                                    false)))
     {
         set_connector_plugindir(path);
     }

system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp

@@ -140,6 +140,7 @@ int main(int argc, char** argv)
             test.expect(new_master_id == server_ids[master_ind], "Switchover to original master failed.");
         }
 
+        test.repl->connect();
         for (int i = 0; i < 4; i++)
         {
             test.try_query(test.repl->nodes[i], set_ac, 1);