diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
| commit | 860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6 (patch) | |
| tree | 4e3298fd280e7e1e3aca5716c0b93f95f636ac4c /scripts/mysqld_safe.sh | |
| parent | cd187ecf90e9988e5a729a1a4db7239e3baa2e6c (diff) | |
| parent | f37bdd9c1a29865574b10fe7d21164ee7cae4d19 (diff) | |
| download | mariadb-git-860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6.tar.gz | |
Merge branch '10.0' into 10.0-galera
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0
Conflicts:
.bzrignore
storage/xtradb/CMakeLists.txt
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 3e6f6fc0e02..b879e718280 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -28,6 +28,7 @@ syslog_tag= user='@MYSQLD_USER@' pid_file= err_log= +err_log_base= syslog_tag_mysqld=mysqld syslog_tag_mysqld_safe=mysqld_safe @@ -285,7 +286,7 @@ parse_arguments() { --user=*) user="$val"; SET_USER=1 ;; --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*) pid_file="$val.pid"; - err_log="$val.err"; + err_log_base="$val"; ;; # these might have been set in a [mysqld_safe] section of my.cnf @@ -661,7 +662,16 @@ then * ) err_log="$DATADIR/$err_log" ;; esac else - err_log=$DATADIR/`@HOSTNAME@`.err + if [ -n "$err_log_base" ] + then + err_log=$err_log_base.err + case "$err_log" in + /* ) ;; + * ) err_log="$DATADIR/$err_log" ;; + esac + else + err_log=$DATADIR/`@HOSTNAME@`.err + fi fi append_arg_to_args "--log-error=$err_log" |