summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-04-28 20:19:32 +0200
committerSergei Golubchik <serg@mariadb.org>2017-04-28 20:19:32 +0200
commite74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch)
treec6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /scripts/mysqld_safe.sh
parentb82c602db588cfa688278ef772050c004590c124 (diff)
parent49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff)
downloadmariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz
Merge branch '10.0' 10.1
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 59f69e79a55..e5708b51be5 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -1106,4 +1106,3 @@ do
done
log_notice "mysqld from pid file $pid_file ended"
-