Attachment 308469 Details for Bug 450178 – unified diff on /etc/rc.d/init.d/mysqld

[patch] unified diff on /etc/rc.d/init.d/mysqld

DIFF (text/plain), 1.70 KB, created by David Tonhofer on 2008-06-05 18:23:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Tonhofer

Created: 2008-06-05 18:23:07 UTC

Size: 1.70 KB

patch

obsolete

>--- mysqld	2008-06-05 17:59:15.000000000 +0200
>+++ mysqld.new	2008-06-05 20:03:44.000000000 +0200
>@@ -46,9 +46,10 @@
> 	chmod 0640 "$errlogfile"
> 	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
> 	if [ ! -d "$datadir/mysql" ] ; then
>-	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db
>+            # If mysql_install_db can't run as "mysql", we have a problem; also, should install in the configured datadir
>+	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --user=mysql --datadir=$datadir
> 	    ret=$?
>-	    chown -R mysql:mysql "$datadir"
>+	    # No longer needed:  chown -R mysql:mysql "$datadir"
> 	    if [ $ret -ne 0 ] ; then
> 		return $ret
> 	    fi
>@@ -58,8 +59,9 @@
> 	# Pass all the options determined above, to ensure consistent behavior.
> 	# In many cases mysqld_safe would arrive at the same conclusions anyway
> 	# but we need to be sure.
>-	/usr/bin/mysqld_safe   --datadir="$datadir" --socket="$socketfile" \
>-		--log-error="$errlogfile" --pid-file="$mypidfile" \
>+        # We also must pass the hardcoded user; having it in the config files is useless
>+	/usr/bin/mysqld_safe  --datadir="$datadir" --socket="$socketfile" \
>+		--log-error="$errlogfile" --pid-file="$mypidfile" --user=mysql \
> 		>/dev/null 2>&1 &
> 	ret=$?
> 	# Spin for a maximum of N seconds waiting for the server to come up.
>@@ -68,7 +70,7 @@
> 	if [ $ret -eq 0 ]; then
> 	    STARTTIMEOUT=30
> 	    while [ $STARTTIMEOUT -gt 0 ]; do
>-		RESPONSE=`/usr/bin/mysqladmin -uUNKNOWN_MYSQL_USER ping 2>&1` && break
>+		RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" -uUNKNOWN_MYSQL_USER ping 2>&1` && break
> 		echo "$RESPONSE" | grep -q "Access denied for user" && break
> 		sleep 1
> 		let STARTTIMEOUT=${STARTTIMEOUT}-1

Actions: View | Diff

Attachments on bug 450178: 308469