diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-15 22:32:22 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-15 22:32:22 -0500 |
| commit | ec9a48112b3caac39fb133d524f499172942d43a (patch) | |
| tree | 7613f36ededa61ed4a4a6822c4139e40fb6fc7ba /scripts | |
| parent | 901f7ebcf3aa45c99f82e655a8482c50f10b840e (diff) | |
| download | mariadb-git-ec9a48112b3caac39fb133d524f499172942d43a.tar.gz | |
Fix bad merge
Diffstat (limited to 'scripts')
| -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 9ab51ded8a8..5bd3b5b06ac 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -988,7 +988,6 @@ do chmod "$fmode" "$err_log" # wrong owner next time we log, so set fi # it up correctly while we can! - eval_log_error "$cmd" end_time=`date +%M%S` if test ! -f "$pid_file" # This is removed if normal shutdown |