From 2ca14303dba220237bd73fc141b6020ed869573c Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@sun.com>
Date: Mon, 23 Nov 2009 13:34:39 +0000
Subject: [PATCH] bug#36462: mysql_install_db fails when run as user root and  
          root-directory not writable

Rather than use the -w test, attempt the chown and bail out if
it fails.
---
 scripts/mysql_install_db.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 7e9b8a69677..b4cfc054b35 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -358,9 +358,15 @@ do
     mkdir -p $dir
     chmod 700 $dir
   fi
-  if test -w / -a ! -z "$user"
+  if test -n "$user"
   then
     chown $user $dir
+    if test $? -ne 0
+    then
+      echo "Cannot change ownership of the database directories to the '$user'"
+      echo "user.  Check that you have the necessary permissions and try again."
+      exit 1
+    fi
   fi
 done