diff --git a/BUILD/mdbci/upgrade_test.sh b/BUILD/mdbci/upgrade_test.sh index 3a74ce6a3..530969a5c 100755 --- a/BUILD/mdbci/upgrade_test.sh +++ b/BUILD/mdbci/upgrade_test.sh @@ -17,14 +17,10 @@ provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null` name=$box-${JOB_NAME}-${BUILD_NUMBER}_upgradetest name=`echo $name | sed "s|/|-|g"` - -cp ${script_dir}/install.json.template ${MDBCI_VM_PATH}/$name.json - - eval "cat < /dev/null > $MDBCI_VM_PATH/${name}.json - while [ -f ~/vagrant_lock ] do sleep 5 diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index ae45f9c44..3f08bde9d 100644 --- a/Documentation/Changelog.md +++ b/Documentation/Changelog.md @@ -51,6 +51,7 @@ For more details, please refer to: * MaxScale now supports IPv6 For more details, please refer to: +* [MariaDB MaxScale 2.1.13 Release Notes](Release-Notes/MaxScale-2.1.13-Release-Notes.md) * [MariaDB MaxScale 2.1.12 Release Notes](Release-Notes/MaxScale-2.1.12-Release-Notes.md) * [MariaDB MaxScale 2.1.11 Release Notes](Release-Notes/MaxScale-2.1.11-Release-Notes.md) * [MariaDB MaxScale 2.1.10 Release Notes](Release-Notes/MaxScale-2.1.10-Release-Notes.md) diff --git a/Documentation/Release-Notes/MaxScale-2.1.13-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.13-Release-Notes.md new file mode 100644 index 000000000..6888bb079 --- /dev/null +++ b/Documentation/Release-Notes/MaxScale-2.1.13-Release-Notes.md @@ -0,0 +1,51 @@ +# MariaDB MaxScale 2.1.13 Release Notes + +Release 2.1.13 is a GA release. + +This document describes the changes in release 2.1.13, when compared +to release [2.1.12](MaxScale-2.1.12-Release-Notes.md). + +If you are upgrading from release 2.0, please also read the following +release notes: + +* [2.1.12](./MaxScale-2.1.12-Release-Notes.md) +* [2.1.11](./MaxScale-2.1.11-Release-Notes.md) +* [2.1.10](./MaxScale-2.1.10-Release-Notes.md) +* [2.1.9](./MaxScale-2.1.9-Release-Notes.md) +* [2.1.8](./MaxScale-2.1.8-Release-Notes.md) +* [2.1.7](./MaxScale-2.1.7-Release-Notes.md) +* [2.1.6](./MaxScale-2.1.6-Release-Notes.md) +* [2.1.5](./MaxScale-2.1.5-Release-Notes.md) +* [2.1.4](./MaxScale-2.1.4-Release-Notes.md) +* [2.1.3](./MaxScale-2.1.3-Release-Notes.md) +* [2.1.2](./MaxScale-2.1.2-Release-Notes.md) +* [2.1.1](./MaxScale-2.1.1-Release-Notes.md) +* [2.1.0](./MaxScale-2.1.0-Release-Notes.md) + +For any problems you encounter, please consider submitting a bug report at +[Jira](https://jira.mariadb.org). + +## Bug fixes + +[Here is a list of bugs fixed in MaxScale 2.1.13.](https://jira.mariadb.org/issues/?jql=project%20%3D%20MXS%20AND%20issuetype%20%3D%20Bug%20AND%20status%20%3D%20Closed%20AND%20fixVersion%20%3D%202.1.13) + +* [MXS-1585](https://jira.mariadb.org/browse/MXS-1585) Crash in MaxScale 2.1.12 +* [MXS-1582](https://jira.mariadb.org/browse/MXS-1582) Maxscale leaving socket behind after shutdown +* [MXS-1581](https://jira.mariadb.org/browse/MXS-1581) CREATE TABLE AS not supported +* [MXS-1580](https://jira.mariadb.org/browse/MXS-1580) Invalid handling of BIT values +* [MXS-1527](https://jira.mariadb.org/browse/MXS-1527) SELECT with session var is not supported + +## Packaging + +RPM and Debian packages are provided for the Linux distributions supported by +MariaDB Enterprise. + +Packages can be downloaded [here](https://mariadb.com/resources/downloads). + +## Source Code + +The source code of MaxScale is tagged at GitHub with a tag, which is identical +with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale +is maxscale-X.Y.Z. + +The source code is available [here](https://github.com/mariadb-corporation/MaxScale). diff --git a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md index 5c1955a8b..625fc5e7d 100644 --- a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md +++ b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md @@ -7,6 +7,7 @@ For more information about MariaDB MaxScale 2.1, please refer to the [ChangeLog](../Changelog.md). For a complete list of changes in MaxScale 2.1, refer to the +* [MaxScale 2.1.13 Release Notes](../Release-Notes/MaxScale-2.1.13-Release-Notes.md) * [MaxScale 2.1.12 Release Notes](../Release-Notes/MaxScale-2.1.12-Release-Notes.md) * [MaxScale 2.1.11 Release Notes](../Release-Notes/MaxScale-2.1.11-Release-Notes.md) * [MaxScale 2.1.10 Release Notes](../Release-Notes/MaxScale-2.1.10-Release-Notes.md) diff --git a/VERSION21.cmake b/VERSION21.cmake index e1964f9f7..bba5e1b04 100644 --- a/VERSION21.cmake +++ b/VERSION21.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "12" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") diff --git a/maxscale-system-test/mxs1585.cpp b/maxscale-system-test/mxs1585.cpp index f50ca8c55..d6656846d 100644 --- a/maxscale-system-test/mxs1585.cpp +++ b/maxscale-system-test/mxs1585.cpp @@ -51,7 +51,7 @@ int main(int argc, char** argv) pthread_create(&a, NULL, query_thr, &test); } - for (int i = 0; i < 15; i++) + for (int i = 0; i < 5; i++) { for (int x = 1; x <= 4; x++) { @@ -59,20 +59,6 @@ int main(int argc, char** argv) sleep(1); test.maxscales->ssh_node_f(0, true, "maxadmin clear server server%d maintenance", x); sleep(2); - - test.maxscales->ssh_node_f(0, true, - "maxadmin remove server server%d " - "\"RW Split Router\" \"Galera Monitor\"", x); - sleep(1); - test.maxscales->ssh_node_f(0, true, - "maxadmin add server server%d " - "\"RW Split Router\" \"Galera Monitor\"", x); - sleep(2); - - test.galera->block_node(x - 1); - sleep(5); - test.galera->unblock_node(x - 1); - sleep(5); } } diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc index f57ceb06b..5a5a2d0f6 100644 --- a/server/modules/filter/cache/test/testkeygeneration.cc +++ b/server/modules/filter/cache/test/testkeygeneration.cc @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include #include "storagefactory.hh" @@ -126,11 +128,16 @@ int main(int argc, char* argv[]) if ((argc == 2) || (argc == 3)) { + char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/"); + set_libdir(libdir); + if (mxs_log_init(NULL, ".", MXS_LOG_TARGET_DEFAULT)) { if (qc_setup(NULL, QC_SQL_MODE_DEFAULT, NULL) && qc_process_init(QC_INIT_BOTH)) { const char* zModule = argv[1]; + libdir = MXS_STRDUP("../storage/storage_inmemory/"); + set_libdir(libdir); StorageFactory* pFactory = StorageFactory::Open(zModule); @@ -172,6 +179,9 @@ int main(int argc, char* argv[]) { cerr << "error: Could not initialize log." << endl; } + + // TODO: Remove this once globally allocated memory is freed + MXS_FREE(libdir); } else { diff --git a/server/modules/filter/cache/test/testlrustorage.cc b/server/modules/filter/cache/test/testlrustorage.cc index 200bb45c8..85de7e61d 100644 --- a/server/modules/filter/cache/test/testlrustorage.cc +++ b/server/modules/filter/cache/test/testlrustorage.cc @@ -13,6 +13,8 @@ #include #include +#include +#include #include "teststorage.hh" #include "testerlrustorage.hh" @@ -46,7 +48,13 @@ private: int main(int argc, char* argv[]) { - TestLRUStorage test(&cout); + char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/"); + set_libdir(libdir); - return test.run(argc, argv); + TestLRUStorage test(&cout); + int rv = test.run(argc, argv); + + // TODO: Remove this once globally allocated memory is freed + MXS_FREE(libdir); + return rv; } diff --git a/server/modules/filter/cache/test/testrawstorage.cc b/server/modules/filter/cache/test/testrawstorage.cc index 45fc4f866..e7f7f9842 100644 --- a/server/modules/filter/cache/test/testrawstorage.cc +++ b/server/modules/filter/cache/test/testrawstorage.cc @@ -13,6 +13,8 @@ #include #include +#include +#include #include "teststorage.hh" #include "testerrawstorage.hh" @@ -46,7 +48,13 @@ private: int main(int argc, char* argv[]) { - TestRawStorage test(&cout); + char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/"); + set_libdir(libdir); - return test.run(argc, argv); + TestRawStorage test(&cout); + int rv = test.run(argc, argv); + + // TODO: Remove this once globally allocated memory is freed + MXS_FREE(libdir); + return rv; }