diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /scripts/mysqld_safe.sh | |
parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r-- | scripts/mysqld_safe.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 018530c84cf..da5906138de 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -956,4 +956,3 @@ do done log_notice "mysqld from pid file $pid_file ended" - |