Bug#28330922 - KEYRING MIGRATION FAILS, BUT SAYS "KEYRING

MIGRATION SUCCESSFULL" + EMPTY FILE Fixed post push tests failures.
mysql · Dec 4, 2018 · 75493ae · 75493ae
1 parent 2ffd8c7
commit 75493ae
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 153 deletions.
diff --git a/mysql-test/suite/auth_sec/r/open_existing_src_file_in_rw_mode.result b/mysql-test/suite/auth_sec/r/open_existing_src_file_in_rw_mode.result
diff --git a/mysql-test/suite/auth_sec/r/success_msg_on_migration_failure.result b/mysql-test/suite/auth_sec/r/success_msg_on_migration_failure.result
diff --git a/mysql-test/suite/auth_sec/t/open_existing_src_file_in_rw_mode.test b/mysql-test/suite/auth_sec/t/open_existing_src_file_in_rw_mode.test
diff --git a/mysql-test/suite/auth_sec/t/success_msg_on_migration_failure.test b/mysql-test/suite/auth_sec/t/success_msg_on_migration_failure.test
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-master.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-master.opt
@@ -0,0 +1 @@
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key1
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-slave.opt b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation-slave.opt
@@ -0,0 +1 @@
+$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key2
diff --git a/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test b/rapid/plugin/group_replication/tests/mtr/t/gr_key_rotation.test
@@ -173,13 +173,15 @@ DELETE FROM t1 WHERE c1=1;
 
 # Clean Up
 
-# Uninstall keyring plugin on server2
+# Uninstall keyring plugin and remove dummy keyring file on server2
 UNINSTALL PLUGIN keyring_file;
+--remove_file $MYSQL_TMP_DIR/mydummy_key2
 
-# Uninstall keyring plugin on server1
+# Uninstall keyring plugin and remove dummy keyring file on server1
 --let $rpl_connection_name= server1
 --source include/rpl_connection.inc
 UNINSTALL PLUGIN keyring_file;
+--remove_file $MYSQL_TMP_DIR/mydummy_key1
 
 DROP TABLE t2;
 DROP TABLE t3;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		$KEYRING_PLUGIN_OPT --loose-keyring-file-data=$MYSQL_TMP_DIR/mydummy_key1