Merge branch '3.2' into 3.3

CMakeLists.txt

@@ -36,7 +36,7 @@ SET(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 3)
 SET(CPACK_PACKAGE_VERSION_MINOR 3)
-SET(CPACK_PACKAGE_VERSION_PATCH 0)
+SET(CPACK_PACKAGE_VERSION_PATCH 1)
 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 +
                             ${CPACK_PACKAGE_VERSION_MINOR} * 100   +
@@ -170,7 +170,7 @@ IF(MAJOR_VERSION)
 ELSE()
   SET(MARIADB_CLIENT_VERSION_MAJOR "10")
   SET(MARIADB_CLIENT_VERSION_MINOR "6")
-  SET(MARIADB_CLIENT_VERSION_PATCH "6")
+  SET(MARIADB_CLIENT_VERSION_PATCH "8")
   SET(MARIADB_CLIENT_VERSION_EXTRA "")
 ENDIF()
 

unittest/libmariadb/my_test.h

@@ -73,7 +73,12 @@ if (IS_SKYSQL(hostname)) \
 #define SKIP_NOTLS
 #endif
 
-#define IS_MAXSCALE() (getenv("srv")!=NULL && (strcmp(getenv("srv"), "maxscale") == 0 || strcmp(getenv("srv"), "skysql-ha") == 0))
+MYSQL *mysql_default = NULL;  /* default connection */
+
+#define IS_MAXSCALE()\
+   ((mysql_default && strstr(mysql_get_server_info(mysql_default), "maxScale")) ||\
+    (getenv("srv")!=NULL && (strcmp(getenv("srv"), "maxscale") == 0 ||\
+     strcmp(getenv("srv"), "skysql-ha") == 0)))
 #define SKIP_MAXSCALE \
 if (IS_MAXSCALE()) \
 { \
@@ -644,7 +649,7 @@ MYSQL *my_test_connect(MYSQL *mysql,
 
 void run_tests(struct my_tests_st *test) {
   int i, rc, total=0;
-  MYSQL *mysql, *mysql_default= NULL;  /* default connection */
+  MYSQL *mysql;
 
   while (test[total].function)
     total++;

unittest/libmariadb/ps_bugs.c

@@ -5425,6 +5425,8 @@ static int test_mdev19838(MYSQL *mysql)
   char charvalue[] = "012345678901234567890123456789012345";
   MYSQL_STMT *stmt;
 
+  SKIP_MAXSCALE;
+
   rc = mysql_query(mysql, "CREATE temporary TABLE mdev19838("
           "f1  char(36),"
           "f2  char(36),"