From: Joerg Bruehe
Date: October 8 2012 2:20pm
Subject: bzr push into mysql-trunk branch (joerg.bruehe:4643 to 4644)
List-Archive: http://lists.mysql.com/commits/144978
Message-Id: <20121008142016.25932.52785.4644@trift-6core.fambruehe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4644 Joerg Bruehe	2012-10-08 [merge]
      Auto-upmerge from 5.6 to trunk

    modified:
      scripts/mysql_install_db.pl.in
 4643 Joerg Bruehe	2012-10-05 [merge]
      Upmerge a merge changeset, contents was already present here

=== modified file 'scripts/mysql_install_db.pl.in'
--- a/scripts/mysql_install_db.pl.in	2012-10-05 11:51:13 +0000
+++ b/scripts/mysql_install_db.pl.in	2012-10-08 14:05:43 +0000
@@ -567,9 +567,22 @@ if ( $opt->{'skip-name-resolve'} and $re
 # Create database directories mysql & test
 # ----------------------------------------------------------------------
 
+# FIXME The shell variant uses "mkdir -p":
+#  - because it is silent if the target exists, or
+#  - because it will cerate the path?
+# Path creation is demanded by testers in bug# 14731457, but that might be risky
+# in case of typos as this is run by root.
+# For now, give an error message:
+my $parent = dirname ( $opt->{ldata} );
+if ( ! -d $parent ) {
+  error($opt,
+        "The parent directory for the data directory '$opt->{ldata}' does not exist.",
+	"If that path was really intended, please create that directory path and then",
+	"restart this script.",
+	"If some other path was intended, please use the correct path when restarting this script.");
+}
 foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
 {
-  # FIXME not really the same as original "mkdir -p", but ok?
   mkdir($dir, 0700) unless -d $dir;
   chown($opt->{user}, $dir) if -w "/" and !$opt->{user};
 }

No bundle (reason: useless for push emails).