diff options
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index ec525bbf15a..9d96fab8bca 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -50834,6 +50834,8 @@ each individual 4.0.x release. @appendixsubsec Changes in release 4.0.5 @itemize @item +Small fix in mysqld_safe for some shells +@item Give error if one has more than 2 ^ 32 rows in a MyISAM MERGE file and one has not compiled MySQL with @code{-DBIG_TABLES}. @item diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index e6ecbf6f729..840b937519a 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -307,8 +307,8 @@ do done fi - echo "`date +'%y%m%d %H:%M:%S mysqld restarted'`" | tee -a $err_log + echo "`date +'%y%m%d %H:%M:%S' mysqld restarted" | tee -a $err_log done -echo "`date +'%y%m%d %H:%M:%S mysqld ended'`" | tee -a $err_log +echo "`date +'%y%m%d %H:%M:%S'` mysqld ended" | tee -a $err_log echo "" | tee -a $err_log |