FB8-262: rpl_slave_tx_isolation fails in 8.0.23

.clang-format

@@ -197,9 +197,6 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpaceBeforeSquareBrackets: false
 Standard:        Auto
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
 TabWidth:        8
 UseCRLF:         false
 UseTab:          Never

.skycastleworkspace.ini

@@ -0,0 +1,3 @@
+[repository]
+name = mysql-5.6
+type = git

CMakeLists.txt

@@ -464,6 +464,13 @@ IF(MY_COMPILER_IS_CLANG OR MY_COMPILER_IS_GNU)
   SET(MY_COMPILER_IS_GNU_OR_CLANG 1)
 ENDIF()
 
+INCLUDE(CTest)
+# Explicitly disabling BUILD_TESTING set by just included CTest, since other
+# code is not ready to handle BUILD_TESTING set. If you try to remove the
+# directive and CMake configuration and reconfiguration finishes successfully,
+# remove the hack.
+SET(BUILD_TESTING OFF)
+
 # Maintainer mode is default on only for debug builds using GCC/G++
 IF(CMAKE_BUILD_TYPE_UPPER STREQUAL "DEBUG" OR WITH_DEBUG)
   IF(MY_COMPILER_IS_GNU)
@@ -570,6 +577,7 @@ INCLUDE(mysql_add_executable)
 INCLUDE(curl)
 INCLUDE(rapidjson)
 INCLUDE(fprofile)
+INCLUDE(prepend_append_cflags_if_supported)
 INCLUDE(gloves)
 
 
@@ -1158,7 +1166,9 @@ ENDIF()
 # Enable debug sync for debug builds.
 FOREACH(LANG C CXX)
   STRING_PREPEND(CMAKE_${LANG}_FLAGS_DEBUG "-DENABLED_DEBUG_SYNC ")
-  STRING_PREPEND(CMAKE_${LANG}_FLAGS_DEBUG "-DSAFE_MUTEX ")
+  IF (NOT DISABLE_SAFE_MUTEX)
+     STRING_PREPEND(CMAKE_${LANG}_FLAGS_DEBUG "-DSAFE_MUTEX ")
+  ENDIF()
 ENDFOREACH()
 
 

azure-pipelines.yml

@@ -216,6 +216,8 @@ jobs:
         -DWITH_BOOST=$(BOOST_DIR)
         -DMYSQL_MAINTAINER_MODE=ON
         -DWITH_SYSTEM_LIBS=ON
+        -DWITH_LZ4=bundled
+        -DWITH_ZSTD=bundled
         -DWITH_MECAB=system
         -DWITH_NUMA=ON
         $SANITIZER_DEFINES

client/check/mysqlcheck_core.cc

@@ -214,7 +214,7 @@ static int use_db(const string &database) {
     return 1;
   if (mysql_get_server_version(sock) >= FIRST_PERFORMANCE_SCHEMA_VERSION &&
       !my_strcasecmp(&my_charset_latin1, database.c_str(),
-                     PERFORMANCE_SCHEMA_DB_NAME))
+                     PERFORMANCE_SCHEMA_DB_NAME_MACRO))
     return 1;
   if (mysql_select_db(sock, database.c_str())) {
     DBError(sock, "when selecting the database");

client/client_priv.h

@@ -196,7 +196,9 @@ enum options_client {
   OPT_CHECKSUM,
   OPT_THREAD_PRIORITY,
   /* Add new option above this */
-  OPT_MAX_CLIENT_OPTION
+  OPT_MAX_CLIENT_OPTION,
+  OPT_COMPRESS_DATA,
+  OPT_COMPRESS_DATA_CHUNK_SIZE
 };
 
 /**
@@ -217,7 +219,7 @@ enum options_client {
 /**
   Name of the performance schema database.
 */
-#define PERFORMANCE_SCHEMA_DB_NAME "performance_schema"
+#define PERFORMANCE_SCHEMA_DB_NAME_MACRO "performance_schema"
 
 /**
   First mysql version supporting the sys schema.

client/dump/mysqldump_tool_chain_maker_options.cc

@@ -210,7 +210,7 @@ void Mysqldump_tool_chain_maker_options::process_positional_options(
     m_object_filter.m_databases_excluded.push_back(
         std::make_pair("", INFORMATION_SCHEMA_DB_NAME));
     m_object_filter.m_databases_excluded.push_back(
-        std::make_pair("", PERFORMANCE_SCHEMA_DB_NAME));
+        std::make_pair("", PERFORMANCE_SCHEMA_DB_NAME_MACRO));
     m_object_filter.m_databases_excluded.push_back(
         std::make_pair("", "ndbinfo"));
     m_object_filter.m_databases_excluded.push_back(std::make_pair("", "sys"));

client/mysql.cc

@@ -4676,6 +4676,11 @@ static int sql_real_connect(char *host, char *database, char *user,
 static bool init_connection_options(MYSQL *mysql) {
   bool handle_expired = (opt_connect_expired_password || !status.batch);
 
+  // Using the compression_lib connection attribute requires connection
+  // attributes be reset early. Parsing the command arguments could add a new
+  // connection attribute
+  mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, nullptr);
+
   if (opt_init_command)
     mysql_options(mysql, MYSQL_INIT_COMMAND, opt_init_command);
 
@@ -4747,7 +4752,6 @@ static bool init_connection_options(MYSQL *mysql) {
     mysql_options(mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
                   (char *)&opt_enable_cleartext_plugin);
 
-  mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, nullptr);
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "mysql");
   if (current_os_user)
     mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "os_user",

client/mysqldump.cc

@@ -166,6 +166,9 @@ static uint opt_enable_cleartext_plugin = 0;
 static bool using_opt_enable_cleartext_plugin = false;
 static uint opt_mysql_port = 0, opt_master_data;
 static uint opt_slave_data;
+static bool opt_compress_data = false;
+static ulonglong opt_compression_chunk_size = 0;
+static bool do_compress = 0;
 static ulong opt_lra_size = 0;
 static ulong opt_lra_sleep = 0;
 static ulong opt_lra_pages_before_sleep = 0;
@@ -723,6 +726,13 @@ static struct my_option my_long_options[] = {
      "Thread Priority of the mysqldump session", &opt_thread_priority,
      &opt_thread_priority, 0, GET_INT, REQUIRED_ARG, 0, -20, 19, nullptr, 0,
      nullptr},
+    {"compress-data", OPT_COMPRESS_DATA,
+     "Enables compression of data using ZSTD", &opt_compress_data,
+     &opt_compress_data, 0, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
+    {"compress-data-chunk-size", OPT_COMPRESS_DATA_CHUNK_SIZE,
+     "Split compressed data on chunks of specified size in megabytes",
+     &opt_compression_chunk_size, &opt_compression_chunk_size, 0, GET_ULL,
+     OPT_ARG, 0, 0, (ulonglong)(~(my_off_t)0), nullptr, 0, nullptr},
     {nullptr, 0, nullptr, nullptr, nullptr, nullptr, GET_NO_ARG, NO_ARG, 0, 0,
      0, nullptr, 0, nullptr}};
 
@@ -1114,6 +1124,19 @@ static bool get_one_option(int optid, const struct my_option *opt,
       /* Store the supplied list of errors into an array. */
       if (parse_ignore_error()) exit(EX_EOM);
       break;
+    case (int)OPT_COMPRESS_DATA:
+      do_compress = 1;
+      break;
+    case (int)OPT_COMPRESS_DATA_CHUNK_SIZE: {
+      // NO_LINT_DEBUG
+      if (opt_compression_chunk_size > 0) {
+        verbose_msg("split data on chunks of %llu bytes size\n",
+                    opt_compression_chunk_size);
+      } else {
+        verbose_msg("No chunking on compressed data\n");
+      }
+      break;
+    }
   }
   return false;
 }
@@ -1210,6 +1233,23 @@ static int get_options(int *argc, char ***argv) {
     return EX_USAGE;
   }
   if (tty_password) opt_password = get_tty_password(NullS);
+
+  if (do_compress && !path) {
+    // NO_LINT_DEBUG
+    fprintf(stderr, "%s: --compress-data must be used with --tab.\n",
+            my_progname);
+    return (EX_USAGE);
+  }
+
+  if (!do_compress && opt_compression_chunk_size > 0) {
+    // NO_LINT_DEBUG
+    fprintf(stderr,
+            "%s: --compress-data-chunk-size > 0 must be used with "
+            "--compress-data.\n",
+            my_progname);
+    return (EX_USAGE);
+  }
+
   return (0);
 } /* get_options */
 
@@ -3943,6 +3983,13 @@ static void dump_table(char *table, char *db) {
     dynstr_append_checked(&query_string, filename);
     dynstr_append_checked(&query_string, "'");
 
+    if (do_compress) {
+      dynstr_append_checked(&query_string, " COMPRESSED(");
+      dynstr_append_checked(&query_string,
+                            std::to_string(opt_compression_chunk_size).c_str());
+      dynstr_append_checked(&query_string, ")");
+    }
+
     dynstr_append_checked(&query_string, " /*!50138 CHARACTER SET ");
     dynstr_append_checked(&query_string,
                           default_charset == mysql_universal_client_charset
@@ -4693,7 +4740,8 @@ static int dump_all_databases() {
       continue;
 
     if (mysql_get_server_version(mysql) >= FIRST_PERFORMANCE_SCHEMA_VERSION &&
-        !my_strcasecmp(&my_charset_latin1, row[0], PERFORMANCE_SCHEMA_DB_NAME))
+        !my_strcasecmp(&my_charset_latin1, row[0],
+                       PERFORMANCE_SCHEMA_DB_NAME_MACRO))
       continue;
 
     if (mysql_get_server_version(mysql) >= FIRST_SYS_SCHEMA_VERSION &&
@@ -4741,7 +4789,7 @@ static int dump_all_databases() {
 
       if (mysql_get_server_version(mysql) >= FIRST_PERFORMANCE_SCHEMA_VERSION &&
           !my_strcasecmp(&my_charset_latin1, row[0],
-                         PERFORMANCE_SCHEMA_DB_NAME))
+                         PERFORMANCE_SCHEMA_DB_NAME_MACRO))
         continue;
 
       if (mysql_get_server_version(mysql) >= FIRST_SYS_SCHEMA_VERSION &&
@@ -5177,7 +5225,8 @@ static int dump_selected_tables(char *db, char **table_names, int tables) {
       !(mysql_get_server_version(mysql) >= FIRST_INFORMATION_SCHEMA_VERSION &&
         !my_strcasecmp(&my_charset_latin1, db, INFORMATION_SCHEMA_DB_NAME)) &&
       !(mysql_get_server_version(mysql) >= FIRST_PERFORMANCE_SCHEMA_VERSION &&
-        !my_strcasecmp(&my_charset_latin1, db, PERFORMANCE_SCHEMA_DB_NAME))) {
+        !my_strcasecmp(&my_charset_latin1, db,
+                       PERFORMANCE_SCHEMA_DB_NAME_MACRO))) {
     if (mysql_real_query(mysql, lock_tables_query.str,
                          (ulong)(lock_tables_query.length - 1))) {
       if (!opt_force) {
@@ -6233,6 +6282,16 @@ int main(int argc, char **argv) {
     exit(exit_code);
   }
 
+  if (opt_rocksdb_bulk_load) {
+    if (!opt_order_by_primary && !opt_order_by_primary_desc) {
+      opt_order_by_primary = true;
+      fprintf(stderr,
+              "-- Warning: --rocksdb-bulk-load requires either "
+              "--order-by-primary or "
+              "--order-by-primary-desc. "
+              "Continuing with --order-by-primary-desc as default option.");
+    }
+  }
   /*
     Disable comments in xml mode if 'comments' option is not explicitly used.
   */