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

1 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/main/mysql_upgrade-6984.test b/mysql-test/main/mysql_upgrade-6984.test
new file mode 100644
index 00000000000..9bbfbeb3f87
--- /dev/null
+++ b/mysql-test/main/mysql_upgrade-6984.test
@@ -0,0 +1,23 @@
+#
+# MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10
+#
+--source include/not_embedded.inc
+
+#
+# When 'root' account is password protected and MYSQL_UPGRADE doesn't
+# know the password (meaning, MYSQL_UPGRADE is run automatically
+# on upgrade), MYSQLD has to be started with --skip-grant-tables.
+#
+# In this setup MYSQL_UPGRADE cannot continue after issuing FLUSH PRIVILEGES
+#
+
+update mysql.user set password=password("foo") where user='root';
+
+--exec $MYSQL_UPGRADE
+
+connect(con1,localhost,root,foo,,,);
+
+update mysql.user set password='' where user='root';
+flush privileges;
+# Load event table
+set global event_scheduler=OFF;