Merge branch '10.11' into 11.4

Author: vuvova

extra/mariabackup/aria_backup_client.cc

@@ -161,7 +161,10 @@ class Table {
 		File m_data_file = -1;
 		MY_STAT m_data_file_stat;
 	};
-	Table() = default;
+	Table()
+        {
+          bzero(&m_cap, sizeof(m_cap));
+        }
 	Table (Table &&other) = delete;
 	Table &  operator= (Table &&other) = delete;
 	Table(const Table &) = delete;
@@ -222,6 +225,7 @@ class Table {
 };
 
 Table::~Table() {
+         aria_free_capabilities(&m_cap);
 	(void)close();
 }
 
@@ -298,7 +302,8 @@ bool Table::open(MYSQL *con, bool opt_no_lock, unsigned thread_num) {
 			goto exit;
 		}
 		if (!have_capabilities) {
-			if ((error= aria_get_capabilities(partition.m_index_file, &m_cap))) {
+                  if ((error= aria_get_capabilities(partition.m_index_file,
+                                                    m_full_name.c_str(), &m_cap))) {
 				msg(thread_num, "aria_get_capabilities failed: %d", error);
 				goto exit;
 			}
@@ -343,6 +348,7 @@ bool Table::open(MYSQL *con, bool opt_no_lock, unsigned thread_num) {
 }
 
 bool Table::close() {
+        aria_free_capabilities(&m_cap);
 	for (Partition &partition : m_partitions) {
 		if (partition.m_index_file >= 0) {
 			my_close(partition.m_index_file, MYF(MY_WME));
@@ -409,14 +415,17 @@ bool Table::copy(ds_ctxt_t *ds, bool is_index, unsigned thread_num) {
                         {
                           if (error == HA_ERR_END_OF_FILE)
                             break;
-                          msg(thread_num, "error: aria_read %s failed:  %d",
-                              is_index ? "index" : "data", error);
+                          msg(thread_num, "error: aria_read %s from %s failed "
+                              "with error %d",
+                              is_index ? "index" : "data", full_name.c_str(),
+                              error);
                           goto err;
 			}
 			xtrabackup_io_throttling();
 			if ((error = ds_write(dst_file, copy_buffer, length))) {
-				msg(thread_num, "error: aria_write failed:  %d", error);
-				goto err;
+                          msg(thread_num, "error: aria_write to %s failed "
+                              "with error: %d", dst_path, error);
+                          goto err;
 			}
 		}
 

extra/mariabackup/backup_mysql.cc

@@ -548,6 +548,7 @@ bool get_mysql_vars(MYSQL *connection)
     xb_load_list_string(ignore_db_dirs, ",", register_ignore_db_dirs_filter);
 
 out:
+  free_mysql_variables(mysql_vars);
 
   return (ret);
 }
@@ -1515,7 +1516,9 @@ write_galera_info(ds_ctxt *datasink, MYSQL *connection)
       domain_id ? domain_id : domain_id55);
 
 cleanup:
+  free_mysql_variables(vars);
   free_mysql_variables(status);
+  free_mysql_variables(value);
 
   return(result);
 }

extra/mariabackup/encryption_plugin.cc

@@ -29,6 +29,7 @@
 extern struct st_maria_plugin *mysql_optional_plugins[];
 extern struct st_maria_plugin *mysql_mandatory_plugins[];
 static void encryption_plugin_init(int argc, char **argv);
+void initialize_default_encryption();
 
 extern char *xb_plugin_load;
 extern char *xb_plugin_dir;
@@ -140,7 +141,10 @@ void encryption_plugin_backup_init(MYSQL *mysql)
   }
   mysql_free_result(result);
   if (!plugin_load.length())
+  {
+    initialize_default_encryption();
     return;
+  }
 
   oss << "plugin_load=" << plugin_load.c_str() + 1 << std::endl;
 
@@ -248,3 +252,45 @@ static void encryption_plugin_init(int argc, char **argv)
   plugin_init(&argc, argv, PLUGIN_INIT_SKIP_PLUGIN_TABLE);
 }
 
+
+/*
+  Setup encryption_handler with default encryption to avoid crashes when
+  calling encryption_get_key
+*/
+uint no_get_key(uint, uint, uchar*, uint*)
+{
+  return ENCRYPTION_KEY_VERSION_INVALID;
+}
+uint no_key(uint)
+{
+  return ENCRYPTION_KEY_VERSION_INVALID;
+}
+
+static int ctx_init(void *ctx, const unsigned char* key, unsigned int klen,
+                    const unsigned char* iv, unsigned int ivlen, int flags,
+                    unsigned int key_id, unsigned int key_version)
+{
+  return my_aes_crypt_init(ctx, MY_AES_CBC, flags, key, klen, iv, ivlen);
+}
+
+static unsigned int get_length(unsigned int slen, unsigned int key_id,
+                               unsigned int key_version)
+{
+  return my_aes_get_size(MY_AES_CBC, slen);
+}
+
+uint ctx_size(unsigned int, unsigned int)
+{
+  return MY_AES_CTX_SIZE;
+}
+
+void initialize_default_encryption()
+{
+  encryption_handler.encryption_ctx_size_func= ctx_size;
+  encryption_handler.encryption_ctx_init_func= ctx_init;
+  encryption_handler.encryption_ctx_update_func= my_aes_crypt_update;
+  encryption_handler.encryption_ctx_finish_func= my_aes_crypt_finish;
+  encryption_handler.encryption_encrypted_length_func= get_length;
+  encryption_handler.encryption_key_get_func= no_get_key;
+  encryption_handler.encryption_key_get_latest_version_func= no_key;
+}

extra/mariabackup/xtrabackup.cc

@@ -5507,6 +5507,7 @@ static bool xtrabackup_backup_func()
 		if (fil_system.is_initialised()) {
 			innodb_shutdown();
 		}
+                backup_datasinks.destroy();
 		return(false);
 	}
 

include/aria_backup.h

@@ -15,11 +15,15 @@
 
 /* Interfaces for doing backups of Aria tables */
 
+#ifndef ARIA_BACKUP_INCLUDED
+
 C_MODE_START
 
 typedef struct st_aria_table_capabilities
 {
   my_off_t header_size;
+  MARIA_CRYPT_DATA *crypt_data;
+  uint crypt_page_header_space;
   ulong bitmap_pages_covered;
   uint block_size;
   uint keypage_header;
@@ -32,11 +36,15 @@ typedef struct st_aria_table_capabilities
   /* s3 capabilities */
   ulong s3_block_size;
   uint8 compression;
+  char filename[FN_REFLEN];
 } ARIA_TABLE_CAPABILITIES;
 
-int aria_get_capabilities(File kfile, ARIA_TABLE_CAPABILITIES *cap);
+int aria_get_capabilities(File kfile, const char *table_name, ARIA_TABLE_CAPABILITIES *cap);
+void aria_free_capabilities(ARIA_TABLE_CAPABILITIES *cap);
 int aria_read_index(File kfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
                     uchar *buffer);
 int aria_read_data(File dfile, ARIA_TABLE_CAPABILITIES *cap, ulonglong block,
                    uchar *buffer, size_t *bytes_read);
 C_MODE_END
+
+#endif /* ARIA_BACKUP_INCLUDED */

mysql-test/suite/galera/r/MDEV-25039.result

@@ -0,0 +1,63 @@
+connection node_2;
+connection node_1;
+#
+# 1. LOCK TABLE and INSERT
+#
+connection node_1;
+CREATE TABLE t1 (
+id varchar(100),
+PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 (
+id varchar(100) , a varchar(100),
+PRIMARY KEY (id,a),
+KEY a (a),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t1 (id)
+) ENGINE=InnoDB;
+CREATE TABLE t3 (
+a varchar(100),
+b varchar(100) ,
+PRIMARY KEY (a, b),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t2 (a)
+) ENGINE=InnoDB;
+LOCK TABLES t1 WRITE;
+INSERT INTO t1 VALUES ('a');
+UNLOCK TABLES;
+connection node_2;
+select * from t1;
+id
+a
+connection node_1;
+select * from t1;
+id
+a
+DROP TABLE t3, t2, t1;
+#
+# 2. FLUSH TABLES WITH READ LOCK and INSERT
+#
+connection node_1;
+CREATE TABLE t1 (
+id varchar(100),
+PRIMARY KEY (id)) engine=innodb;
+CREATE TABLE t2 (
+id varchar(100) , a varchar(100),
+PRIMARY KEY (id,a),
+KEY a (a),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t1 (id)
+) ENGINE=InnoDB;
+CREATE TABLE t3 (
+a varchar(100),
+b varchar(100) ,
+PRIMARY KEY (a, b),
+CONSTRAINT FOREIGN KEY (a) REFERENCES t2 (a)
+) ENGINE=InnoDB;
+FLUSH TABLES WITH READ LOCK;
+INSERT INTO t1 VALUES ('a');
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+UNLOCK TABLES;
+connection node_2;
+select * from t1;
+id
+connection node_1;
+select * from t1;
+id
+DROP TABLE t3, t2, t1;

mysql-test/suite/galera/r/galera_multi_level_fk_ddl_insert.result

@@ -48,7 +48,6 @@ connection node_2;
 SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached";
 SET SESSION wsrep_sync_wait = 0;
 connection node_1;
-SET GLOBAL DEBUG_DBUG = '+d,wsrep_print_foreign_keys_table';
 START TRANSACTION;
 INSERT INTO t1 VALUES (3,0);
 COMMIT;
@@ -62,10 +61,6 @@ connection node_1;
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL DEBUG_DBUG = "";
 SET GLOBAL wsrep_slave_threads=DEFAULT;
-connection node_1;
-include/assert_grep.inc [Foreign key referenced table found: 2 tables]
-include/assert_grep.inc [Foreign key referenced table found: test.t2]
-include/assert_grep.inc [Foreign key referenced table found: test.t3]
 connection node_2;
 select * from t1;
 id	f2
@@ -146,7 +141,6 @@ connection node_2;
 SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached";
 SET SESSION wsrep_sync_wait = 0;
 connection node_1;
-SET GLOBAL DEBUG_DBUG = '+d,wsrep_print_foreign_keys_table';
 START TRANSACTION;
 INSERT INTO t1 VALUES (3,0);
 COMMIT;
@@ -160,11 +154,6 @@ connection node_1;
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL DEBUG_DBUG = "";
 SET GLOBAL wsrep_slave_threads=DEFAULT;
-connection node_1;
-include/assert_grep.inc [Foreign key referenced table found: 3 tables]
-include/assert_grep.inc [Foreign key referenced table found: test.t2]
-include/assert_grep.inc [Foreign key referenced table found: test.t3]
-include/assert_grep.inc [Foreign key referenced table found: test.t4]
 connection node_2;
 select * from t1;
 id	f2
@@ -233,7 +222,6 @@ connection node_2;
 SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached";
 SET SESSION wsrep_sync_wait = 0;
 connection node_1;
-SET GLOBAL DEBUG_DBUG = '+d,wsrep_print_foreign_keys_table';
 START TRANSACTION;
 INSERT INTO t1 VALUES (3,0);
 COMMIT;
@@ -247,11 +235,6 @@ connection node_1;
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL DEBUG_DBUG = "";
 SET GLOBAL wsrep_slave_threads=DEFAULT;
-connection node_1;
-include/assert_grep.inc [Foreign key referenced table found: 2 tables]
-include/assert_grep.inc [Foreign key referenced table found: test.t2]
-include/assert_grep.inc [Foreign key referenced table found: test.t3]
-include/assert_grep.inc [Foreign key referenced table found: test.t4]
 connection node_2;
 select * from t1;
 id	f2
@@ -323,7 +306,6 @@ connection node_2;
 SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached";
 SET SESSION wsrep_sync_wait = 0;
 connection node_1;
-SET GLOBAL DEBUG_DBUG = '+d,wsrep_print_foreign_keys_table';
 START TRANSACTION;
 INSERT INTO t1 VALUES (3,0);
 COMMIT;
@@ -337,10 +319,6 @@ connection node_1;
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL DEBUG_DBUG = "";
 SET GLOBAL wsrep_slave_threads=DEFAULT;
-connection node_1;
-include/assert_grep.inc [Foreign key referenced table found: 1 tables]
-include/assert_grep.inc [Foreign key referenced table found: test.t2]
-include/assert_grep.inc [Foreign key referenced table found: test.t3]
 connection node_2;
 select * from t1;
 id	f2