Tim Starling has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397912 )
Change subject: Fix 'sql' script for multi-instance hosts
......................................................................
Fix 'sql' script for multi-instance hosts
It needs to extract the port, if one is present, to pass host and port
separately to mysql's `-h` and `--port` options.
Bug: T182713
Change-Id: Icc0fdf43e226f21dbb5e7de7b7cf74f834382cf3
---
M modules/scap/files/sql
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/scap/files/sql b/modules/scap/files/sql
index 05fa44d..f699317 100755
--- a/modules/scap/files/sql
+++ b/modules/scap/files/sql
@@ -68,7 +68,13 @@
exit 1
fi
+port=3306
+if echo "$host" | grep -qP ':\d+\z'; then
+ port=`echo "$host" | sed 's/.*://'`
+ host=`echo "$host" | sed 's/:[0-9]\+$//'`
+fi
+
pass=`echo 'echo \$wgDBadminpassword;' | /usr/local/bin/mwscript eval.php
--wiki="$lookupdb"`
# Execute mysql.
-exec mysql -u wikiadmin -p$pass -h $host -D $db "$@"
+exec mysql -u wikiadmin -p$pass -h "$host" --port $port -D $db "$@"
--
To view, visit https://gerrit.wikimedia.org/r/397912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc0fdf43e226f21dbb5e7de7b7cf74f834382cf3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
