diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-17 02:35:16 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-17 04:16:38 +0200 |
| commit | 1e192e901ccf34454967cc3f62a71432c50f2c88 (patch) | |
| tree | d58eaa3ddcd6b1427630dd959737f9ae5eb965df /scripts/mysqld_safe.sh | |
| parent | d807e41511c92a1497f8550fdee6557eb856218a (diff) | |
| download | mariadb-git-1e192e901ccf34454967cc3f62a71432c50f2c88.tar.gz | |
Post merge review fixes
* Remove duplicate lines from tests
* Use thd instead of current_thd
* Remove extra wsrep_binlog_format_names
* Correctly merge union patch from 5.5 wrt duplicate rows.
* Correctly merge SELinux changes into 10.1
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 8faa11467d4..59f69e79a55 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -975,10 +975,6 @@ cmd="$cmd $args" # Avoid 'nohup: ignoring input' warning test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null" -# close stdout and stderr, everything goes to $logging now -exec 1>&- -exec 2>&- - log_notice "Starting $MYSQLD daemon with databases from $DATADIR" # variable to track the current number of "fast" (a.k.a. subsecond) restarts |