Merge 10.4 into 10.5

MariaDB · Sep 5, 2022 · ba987a4 · ba987a4
2 parents 244fdc4 + 2917bd0
commit ba987a4
Show file tree

Hide file tree

Showing 40 changed files with 207 additions and 149 deletions.
diff --git a/include/wsrep.h b/include/wsrep.h
@@ -17,62 +17,58 @@
 #define WSREP_INCLUDED
 
 #include <my_config.h>
+#include "log.h"
 
 #ifdef WITH_WSREP
-
 #define IF_WSREP(A,B) A
-
 #define DBUG_ASSERT_IF_WSREP(A) DBUG_ASSERT(A)
 
-#define WSREP_MYSQL_DB (char *)"mysql"
-
-#define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_)              \
-  if (WSREP_ON && WSREP(thd) && wsrep_to_isolation_begin(thd, db_, table_, table_list_)) \
-    goto wsrep_error_label;
-
-#define WSREP_TO_ISOLATION_BEGIN_CREATE(db_, table_, table_list_, create_info_)	\
-  if (WSREP_ON && WSREP(thd) &&                                         \
-      wsrep_to_isolation_begin(thd, db_, table_,                        \
-                               table_list_, nullptr, nullptr, create_info_))\
-    goto wsrep_error_label;
-
-#define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_, fk_tables_, create_info_)	\
-  if (WSREP(thd) && wsrep_thd_is_local(thd) &&				\
-      wsrep_to_isolation_begin(thd, db_, table_,			\
-                               table_list_, alter_info_,		\
-                               fk_tables_, create_info_))
-
-#define WSREP_TO_ISOLATION_END                                          \
-  if ((WSREP(thd) && wsrep_thd_is_local_toi(thd)) ||                    \
-      wsrep_thd_is_in_rsu(thd))                                         \
-    wsrep_to_isolation_end(thd);
-
-/*
-  Checks if lex->no_write_to_binlog is set for statements that use LOCAL or
-  NO_WRITE_TO_BINLOG.
-*/
-#define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_)                   \
-  if (WSREP(thd) && !thd->lex->no_write_to_binlog                                   \
-         && wsrep_to_isolation_begin(thd, db_, table_, table_list_)) goto wsrep_error_label;
+extern ulong wsrep_debug; // wsrep_mysqld.cc
+extern void WSREP_LOG(void (*fun)(const char* fmt, ...), const char* fmt, ...);
+
+#define WSREP_DEBUG(...)                                                \
+    if (wsrep_debug)     WSREP_LOG(sql_print_information, ##__VA_ARGS__)
+#define WSREP_INFO(...)  WSREP_LOG(sql_print_information, ##__VA_ARGS__)
+#define WSREP_WARN(...)  WSREP_LOG(sql_print_warning,     ##__VA_ARGS__)
+#define WSREP_ERROR(...) WSREP_LOG(sql_print_error,       ##__VA_ARGS__)
+#define WSREP_UNKNOWN(fmt, ...) WSREP_ERROR("UNKNOWN: " fmt, ##__VA_ARGS__)
+
+#define WSREP_LOG_CONFLICT_THD(thd, role)                               \
+  WSREP_INFO("%s: \n "                                                  \
+             "  THD: %lu, mode: %s, state: %s, conflict: %s, seqno: %lld\n " \
+             "  SQL: %s",                                               \
+             role,                                                      \
+             thd_get_thread_id(thd),                                    \
+             wsrep_thd_client_mode_str(thd),                            \
+             wsrep_thd_client_state_str(thd),                           \
+             wsrep_thd_transaction_state_str(thd),                      \
+             wsrep_thd_trx_seqno(thd),                                  \
+             wsrep_thd_query(thd)                                       \
+            );
+
+#define WSREP_LOG_CONFLICT(bf_thd, victim_thd, bf_abort)                \
+  if (wsrep_debug || wsrep_log_conflicts)                               \
+  {                                                                     \
+    WSREP_INFO("cluster conflict due to %s for threads:",               \
+               (bf_abort) ? "high priority abort" : "certification failure" \
+              );                                                        \
+    if (bf_thd)     WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread");   \
+    if (victim_thd) WSREP_LOG_CONFLICT_THD(victim_thd, "Victim thread"); \
+    WSREP_INFO("context: %s:%d", __FILE__, __LINE__); \
+  }
 
-#define WSREP_SYNC_WAIT(thd_, before_)                                  \
-    { if (WSREP_CLIENT(thd_) &&                                         \
-          wsrep_sync_wait(thd_, before_)) goto wsrep_error_label; }
 
 #else /* !WITH_WSREP */
 
 /* These macros are needed to compile MariaDB without WSREP support
  * (e.g. embedded) */
 
 #define IF_WSREP(A,B) B
+//#define DBUG_ASSERT_IF_WSREP(A)
 #define WSREP_DEBUG(...)
+//#define WSREP_INFO(...)
+//#define WSREP_WARN(...)
 #define WSREP_ERROR(...)
-#define WSREP_TO_ISOLATION_BEGIN(db_, table_, table_list_) do { } while(0)
-#define WSREP_TO_ISOLATION_BEGIN_ALTER(db_, table_, table_list_, alter_info_, fk_tables_, create_info_)
-#define WSREP_TO_ISOLATION_END
-#define WSREP_TO_ISOLATION_BEGIN_CREATE(db_, table_, table_list_, create_info_)
-#define WSREP_TO_ISOLATION_BEGIN_WRTCHK(db_, table_, table_list_)
-#define WSREP_SYNC_WAIT(thd_, before_)
 #endif /* WITH_WSREP */
 
 #endif /* WSREP_INCLUDED */
diff --git a/sql/backup.cc b/sql/backup.cc
@@ -34,7 +34,9 @@
 #include "sql_insert.h"                         // kill_delayed_threads
 #include "sql_handler.h"                        // mysql_ha_cleanup_no_free
 #include <my_sys.h>
-#include "wsrep_mysqld.h"
+#ifdef WITH_WSREP
+#include "wsrep_server_state.h"
+#endif /* WITH_WSREP */
 
 static const char *stage_names[]=
 {"START", "FLUSH", "BLOCK_DDL", "BLOCK_COMMIT", "END", 0};

diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
@@ -32,6 +32,7 @@
 #include "sp_head.h"
 #include "sql_show.h"                // append_definer, append_identifier
 #include "mysql/psi/mysql_sp.h"
+#include "wsrep_mysqld.h"
 #ifdef WITH_WSREP
 #include "wsrep_trans_observer.h"
 #endif /* WITH_WSREP */

diff --git a/sql/events.cc b/sql/events.cc
@@ -35,6 +35,7 @@
 #include "set_var.h"
 #include "lock.h"   // lock_object_name
 #include "mysql/psi/mysql_sp.h"
+#include "wsrep_mysqld.h"
 
 /**
   @addtogroup Event_Scheduler

diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -55,6 +55,9 @@
 #include "debug_sync.h"
 #include "sql_base.h"
 #include "sql_cte.h"
+#ifdef WITH_WSREP
+#include "mysql/service_wsrep.h"
+#endif /* WITH_WSREP */
 
 #ifdef NO_EMBEDDED_ACCESS_CHECKS
 #define sp_restore_security_context(A,B) while (0) {}

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
@@ -5273,8 +5273,8 @@ String *Item_temptable_rowid::val_str(String *str)
 }
 
 #ifdef WITH_WSREP
-
 #include "wsrep_mysqld.h"
+#include "wsrep_server_state.h"
 /* Format is %d-%d-%llu */
 #define WSREP_MAX_WSREP_SERVER_GTID_STR_LEN 10+1+10+1+20
 

diff --git a/sql/lock.cc b/sql/lock.cc
@@ -79,7 +79,10 @@
 #include "sql_parse.h"                     // is_log_table_write_query
 #include "sql_handler.h"
 #include <hash.h>
+#ifdef WITH_WSREP
 #include "wsrep_mysqld.h"
+#include "wsrep_server_state.h"
+#endif
 
 /**
   @defgroup Locking Locking

diff --git a/sql/log.h b/sql/log.h
@@ -18,7 +18,6 @@
 #define LOG_H
 
 #include "handler.h"                            /* my_xid */
-#include "wsrep_mysqld.h"
 #include "rpl_constants.h"
 
 class Relay_log_info;

diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -43,6 +43,9 @@
 #include <strfunc.h>
 #include "compat56.h"
 #include "sql_insert.h"
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif /* WITH_WSREP */
 #else
 #include "mysqld_error.h"
 #endif /* MYSQL_CLIENT */

diff --git a/sql/mdl.cc b/sql/mdl.cc
@@ -30,6 +30,9 @@
 #include <mysql/psi/mysql_mdl.h>
 #include <algorithm>
 #include <array>
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif
 
 static PSI_memory_key key_memory_MDL_context_acquire_locks;
 

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -77,6 +77,7 @@
 #ifdef WITH_WSREP
 #include "wsrep_thd.h"
 #include "wsrep_sst.h"
+#include "wsrep_server_state.h"
 #endif /* WITH_WSREP */
 #include "proxy_protocol.h"
 

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
@@ -46,6 +46,7 @@
 #include "sql_audit.h"
 #include "debug_sync.h"
 #ifdef WITH_WSREP
+#include "wsrep.h"
 #include "wsrep_trans_observer.h"
 #endif /* WITH_WSREP */
 

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
@@ -56,6 +56,7 @@
 #include "password.h"
 
 #include "sql_plugin_compat.h"
+#include "wsrep_mysqld.h"
 
 #define MAX_SCRAMBLE_LENGTH 1024
 

diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
@@ -347,6 +347,9 @@ TODO list:
 #include "probes_mysql.h"
 #include "transaction.h"
 #include "strfunc.h"
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif
 
 const uchar *query_state_map;
 

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
@@ -67,6 +67,7 @@
 #ifdef WITH_WSREP
 #include "wsrep_thd.h"
 #include "wsrep_trans_observer.h"
+#include "wsrep_server_state.h"
 #else
 static inline bool wsrep_is_bf_aborted(THD* thd) { return false; }
 #endif /* WITH_WSREP */

diff --git a/sql/sql_class.h b/sql/sql_class.h
@@ -65,7 +65,8 @@ void set_thd_stage_info(void *thd,
 #include "my_apc.h"
 #include "rpl_gtid.h"
 
-#include "wsrep_mysqld.h"
+#include "wsrep.h"
+#include "wsrep_on.h"
 #ifdef WITH_WSREP
 #include <inttypes.h>
 /* wsrep-lib */
@@ -75,6 +76,11 @@ void set_thd_stage_info(void *thd,
 #include "wsrep_condition_variable.h"
 
 class Wsrep_applier_service;
+enum wsrep_consistency_check_mode {
+    NO_CONSISTENCY_CHECK,
+    CONSISTENCY_CHECK_DECLARED,
+    CONSISTENCY_CHECK_RUNNING,
+};
 #endif /* WITH_WSREP */
 
 class Reprepare_observer;

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
@@ -37,6 +37,9 @@
 #include "sql_partition.h"
 #include "sql_partition_admin.h"               // Sql_cmd_alter_table_*_part
 #include "event_parse_data.h"
+#ifdef WITH_WSREP
+#include "mysql/service_wsrep.h"
+#endif
 
 void LEX::parse_error(uint err_number)
 {

diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
@@ -32,6 +32,7 @@
 #include "ha_partition.h"                   // ha_partition
 #endif
 #include "sql_base.h"                       // open_and_lock_tables
+#include "wsrep_mysqld.h"
 
 #ifndef WITH_PARTITION_STORAGE_ENGINE
 

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
@@ -40,6 +40,7 @@
 #include <mysql/plugin_data_type.h>
 #include <mysql/plugin_function.h>
 #include "sql_plugin_compat.h"
+#include "wsrep_mysqld.h"
 
 static PSI_memory_key key_memory_plugin_mem_root;
 static PSI_memory_key key_memory_plugin_int_mem_root;

diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
@@ -32,6 +32,9 @@
 #include "debug_sync.h"
 #include "des_key_file.h"
 #include "transaction.h"
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif
 
 static void disable_checkpoints(THD *thd);
 

diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc
@@ -29,7 +29,8 @@
 #include "sql_trigger.h"
 #include "sql_base.h"   // tdc_remove_table, lock_table_names,
 #include "sql_handler.h"                        // mysql_ha_rm_tables
-#include "sql_statistics.h" 
+#include "sql_statistics.h"
+#include "wsrep_mysqld.h"
 
 static TABLE_LIST *rename_tables(THD *thd, TABLE_LIST *table_list,
                                  bool skip_error, bool if_exits,

diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc
@@ -26,6 +26,9 @@
 #include "transaction.h"
 #include "lock.h"
 #include "sql_acl.h"
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif
 
 struct Field_definition
 {

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -57,6 +57,7 @@
 #include "tztime.h"
 #include "sql_insert.h"                        // binlog_drop_table
 #include <algorithm>
+#include "wsrep_mysqld.h"
 
 #ifdef __WIN__
 #include <io.h>

diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
@@ -35,6 +35,7 @@
 #include <mysys_err.h>
 #include "debug_sync.h"
 #include "mysql/psi/mysql_sp.h"
+#include "wsrep_mysqld.h"
 
 /*************************************************************************/
 

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
@@ -65,6 +65,9 @@
 #include "semisync_master.h"
 #include "semisync_slave.h"
 #include <ssl_compat.h>
+#ifdef WITH_WSREP
+#include "wsrep_mysqld.h"
+#endif
 
 #define PCRE2_STATIC 1             /* Important on Windows */
 #include "pcre2.h"                 /* pcre2 header file */

diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
@@ -16,11 +16,11 @@
 #include "mariadb.h"
 #include "mysql/service_wsrep.h"
 #include "wsrep_binlog.h"
-#include "wsrep_priv.h"
 #include "log.h"
 #include "slave.h"
 #include "log_event.h"
 #include "wsrep_applier.h"
+#include "wsrep_mysqld.h"
 
 #include "transaction.h"
 

diff --git a/sql/wsrep_check_opts.cc b/sql/wsrep_check_opts.cc
@@ -19,6 +19,7 @@
 #include "sys_vars_shared.h"
 #include "wsrep.h"
 #include "wsrep_sst.h"
+#include "wsrep_mysqld.h"
 
 extern char *my_bind_addr_str;
 

diff --git a/sql/wsrep_client_service.cc b/sql/wsrep_client_service.cc
@@ -1,4 +1,4 @@
-/* Copyright 2018-2021 Codership Oy <info@codership.com>
+/* Copyright 2018-2022 Codership Oy <info@codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #include "wsrep_thd.h"
 #include "wsrep_xid.h"
 #include "wsrep_trans_observer.h"
+#include "wsrep_server_state.h"
+#include "wsrep_mysqld.h"
 
 #include "sql_base.h"    /* close_temporary_table() */
 #include "sql_class.h"   /* THD */

diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc
@@ -19,6 +19,7 @@
 #include "wsrep_schema.h"
 #include "wsrep_xid.h"
 #include "wsrep_trans_observer.h"
+#include "wsrep_server_state.h"
 
 #include "sql_class.h" /* THD */
 #include "transaction.h"