Create 'main' test directory and move 't' and 'r' there

1 files changed, 32 insertions, 0 deletions

diff --git a/mysql-test/main/plugin_vars.result b/mysql-test/main/plugin_vars.result
new file mode 100644
index 00000000000..0e382427b1d
--- /dev/null
+++ b/mysql-test/main/plugin_vars.result
@@ -0,0 +1,32 @@
+#
+# MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES and
+#             INSTALL PLUGIN
+#
+CREATE PROCEDURE p_install(x INT)
+BEGIN
+DECLARE CONTINUE HANDLER FOR 1126 BEGIN END;
+WHILE x DO
+SET x= x - 1;
+INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END WHILE;
+END|
+CREATE PROCEDURE p_show_vars(x INT)
+WHILE x DO
+SET x= x - 1;
+SHOW VARIABLES;
+END WHILE|
+connect con1, localhost, root,,;
+connect con2, localhost, root,,;
+connection con1;
+CALL p_install(100);
+connection con2;
+CALL p_show_vars(100);
+connection default;
+connection con1;
+connection con2;
+connection default;
+disconnect con1;
+disconnect con2;
+USE test;
+DROP PROCEDURE p_install;
+DROP PROCEDURE p_show_vars;