From a152d9fbf8dcb6ad4b821c81091e72361367775f Mon Sep 17 00:00:00 2001
From: Pavan Naik <pavan.naik@oracle.com>
Date: Sat, 28 Apr 2018 17:05:54 +0530
Subject: [PATCH] BUG#27807237: MTR --MANUAL-BOOT-GDB FAILS ON MYSQL-5.7 BUILDS

Description:
------------
MTR --manual-boot-gdb fails on mysql-5.7 builds.

Issue:
------
When --manual-boot-gdb option is enabled, mysql and test directories
are not created, causing the 'mysqld --bootstap' command to fail.

Fix:
----
Create the directories for mysql and test database under datadir
location before invoking gdb for mysqld bootstrap.

Change-Id: I14a8560a3c16fde2f10910375a7e3bbef3d6bc0e
---
 mysql-test/mysql-test-run.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 3f4f0b2deeb8..50b30c4ea270 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4040,6 +4040,10 @@ sub mysql_install_db {
   mtr_tofile($bootstrap_sql_file,
              sql_to_bootstrap(mtr_grab_file("include/mtr_check.sql")));
 
+  # Create directories mysql and test
+  mkpath("$install_datadir/mysql");
+  mkpath("$install_datadir/test");
+
   if ( $opt_manual_boot_gdb )
   {
     # The configuration has been set up and user has been prompted for
@@ -4055,10 +4059,6 @@ sub mysql_install_db {
   mtr_tofile($path_bootstrap_log,
 	     "$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");
 
-  # Create directories mysql and test
-  mkpath("$install_datadir/mysql");
-  mkpath("$install_datadir/test");
-
   if ( My::SafeProcess->run
        (
 	name          => "bootstrap",