summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_config.sh2
-rw-r--r--scripts/mysqld_safe.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index ab58c512aac..ae58655ed0f 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -126,7 +126,7 @@ done
cflags=`echo "$cflags"|sed -e 's/ *\$//'`
# Same for --libs(_r)
-for remove in lmtmalloc static-libcxa i-static
+for remove in lmtmalloc static-libcxa i-static static-intel
do
# We know the strings starts with a space
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index e6f7ff7b3cb..d9c1a16e21a 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -363,7 +363,7 @@ then
USER_OPTION="--user=$user"
fi
# Change the err log to the right user, if it is in use
- if [ $syslog -eq 0 ]; then
+ if [ $want_syslog -eq 0 ]; then
touch $err_log
chown $user $err_log
fi