From 3f3ca25506443b34b79d31f3519ff838d4bde20b Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Fri, 25 Oct 2019 13:08:31 -0600 Subject: [PATCH 1/3] Examples: search for mysqld instead of mysqld_safe Fixes #5359 Signed-off-by: Morgan Tocker --- examples/local/env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/local/env.sh b/examples/local/env.sh index 107b40a76f..ef9a0c8538 100644 --- a/examples/local/env.sh +++ b/examples/local/env.sh @@ -20,11 +20,11 @@ vtctld_web_port=15000 # Set up environment. export VTTOP=${VTTOP-$VTROOT/src/vitess.io/vitess} -# Try to find mysqld_safe on PATH. +# Try to find mysqld on PATH. if [ -z "$VT_MYSQL_ROOT" ]; then - mysql_path=`which mysqld_safe` + mysql_path=`which mysqld` if [ -z "$mysql_path" ]; then - echo "Can't guess location of mysqld_safe. Please set VT_MYSQL_ROOT so it can be found at \$VT_MYSQL_ROOT/bin/mysqld_safe." + echo "Can't guess location of mysqld. Please set VT_MYSQL_ROOT manually." exit 1 fi export VT_MYSQL_ROOT=$(dirname `dirname $mysql_path`)