hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-05-28 09:01:49 +03:00
parent e2642d64b9 0907e0f0e5
commit e565a6d9b8
5 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
VERSION20.cmake
View File

@ -1,16 +0,0 @@
# MaxScale version for CMake
#
# This file contains cache values for CMake which control MaxScale's version
# number.
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "3" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")

16
VERSION21.cmake
View File

@ -1,16 +0,0 @@
# MaxScale version for CMake
#
# This file contains cache values for CMake which control MaxScale's version
# number.
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "18" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")

16
VERSION22.cmake
View File

@ -1,16 +0,0 @@
# MaxScale version for CMake
#
# This file contains cache values for CMake which control MaxScale's version
# number.
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "22" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity")
set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")

14
maxscale-system-test/maxtest/src/mariadb_nodes.cc
View File

@ -1252,16 +1252,10 @@ int Mariadb_nodes::configure_ssl(bool require)
int Mariadb_nodes::disable_ssl() int Mariadb_nodes::disable_ssl()
{ {
int local_result = 0; int local_result = connect();
char str[1024]; local_result += execute_query(
nodes[0], "DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
local_result += connect(); user_name, user_name, password);
sprintf(str,
"DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
user_name,
user_name,
password);
local_result += execute_query(nodes[0], "%s", "");
close_connections(); close_connections();
for (int i = 0; i < N; i++) for (int i = 0; i < N; i++)

2
maxscale-system-test/utilities.cmake
View File

@ -166,7 +166,7 @@ function(add_test_executable_ex)
message(FATAL_ERROR "VMS is not set.") message(FATAL_ERROR "VMS is not set.")
else() else()
# Check that the vms setup is recognized. # Check that the vms setup is recognized.
set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale) set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale backend_ssl)
foreach(elem ${vms_setup}) foreach(elem ${vms_setup})
list(FIND known_vms_setups ${elem} vms_ind) list(FIND known_vms_setups ${elem} vms_ind)
if (vms_ind GREATER -1) if (vms_ind GREATER -1)