[patch] patch for the eclass

mysql.eclass-prefix.patch (text/plain), 1.42 KB, created by Thomas Burkard on 2010-10-01 17:16:29 UTC

--- /home/camorup/.gentoo/usr/portage/eclass/mysql.eclass	2010-05-15 16:31:46.000000000 +0200
+++ eclass/mysql.eclass	2010-10-01 18:54:09.222861552 +0200
@@ -1271,7 +1271,7 @@
 	popd &>/dev/null
 	[[ -f "${EROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
 	|| die "MySQL databases not installed"
-	chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
+	use prefix || chown -R mysql:mysql "${EROOT}/${MY_DATADIR}" 2>/dev/null
 	chmod 0750 "${EROOT}/${MY_DATADIR}" 2>/dev/null
 
 	# Figure out which options we need to disable to do the setup
@@ -1306,7 +1306,6 @@
 	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
 	local mysqld="${EROOT}/usr/sbin/mysqld \
 		${options} \
-		--user=mysql \
 		--basedir=${EROOT}/usr \
 		--datadir=${EROOT}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
@@ -1330,19 +1329,14 @@
 	fi
 
 	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
-	"${EROOT}/usr/bin/mysql" \
-		--socket=${socket} \
-		-hlocalhost \
-		-e "${sql}"
+	"${EROOT}/usr/bin/mysqladmin" --socket="${socket}" --user=root password "${MYSQL_ROOT_PASSWORD}"
 	eend $?
 
 	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
 	"${EROOT}/usr/bin/mysql" \
 		--socket=${socket} \
 		-hlocalhost \
-	
+		-uroot \	
 		-p"${MYSQL_ROOT_PASSWORD}" \
 		mysql < "${sqltmp}"
 	rc=$?