diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
| commit | fa3f8a18b247d5d7d86d60d016681cc188522f80 (patch) | |
| tree | 180232f5e13c81e22ae9374b41be168ed9578932 /scripts | |
| parent | efab095c7f8f044525ce7d2313fad5f86032baab (diff) | |
| parent | 543b6e02246db25d8a61574fc709b28e7720d1a0 (diff) | |
| download | mariadb-git-fa3f8a18b247d5d7d86d60d016681cc188522f80.tar.gz | |
mysql-5.5.34 merge
(some patches reverted, test case added)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 430b0067c11..a8e1cac2793 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -544,7 +544,6 @@ else fi plugin_dir="${plugin_dir}${PLUGIN_VARIANT}" - # Determine what logging facility to use # Ensure that 'logger' exists, if it's requested @@ -568,6 +567,7 @@ then # mysqld does not add ".err" to "--log-error=foo."; it considers a # trailing "." as an extension + if expr "$err_log" : '.*\.[^/]*$' > /dev/null then : |