diff options
| -rw-r--r-- | Docs/manual.texi | 3 | ||||
| -rw-r--r-- | extra/resolveip.c | 2 | ||||
| -rwxr-xr-x | man/safe_mysqld.1 | 8 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 6 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index e67e1dc0468..deac65945f7 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -41178,8 +41178,7 @@ of the following flags in very special circumstances: A @code{MYSQL*} connection handle if the connection was successful, @code{NULL} if the connection was unsuccessful. For a successful connection, -the return value is the same as the value of the first parameter, unless you -pass @code{NULL} for that parameter. +the return value is the same as the value of the first parameter. @subsubheading Errors diff --git a/extra/resolveip.c b/extra/resolveip.c index a75c7ecc97a..4856bead200 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -22,7 +22,9 @@ #include <global.h> #include <m_ctype.h> #include <my_sys.h> +#ifndef SCO #include <m_string.h> +#endif #include <sys/types.h> #include <sys/socket.h> #ifndef HAVE_BROKEN_NETINET_INCLUDES diff --git a/man/safe_mysqld.1 b/man/safe_mysqld.1 index 30abf04ae6b..3874801be3b 100755 --- a/man/safe_mysqld.1 +++ b/man/safe_mysqld.1 @@ -1,7 +1,6 @@ -.TH SAFE_MYSQLD 1 "19 December 2000" +.TH SAFE_MYSQLD 1 "19 December 2000" "safe_mysqld (mysql)" mysql.com .SH NAME -.BR safe_mysqld -is the recommended way to start a mysqld daemon on Unix. safe_mysqld adds some safety features such as restarting the server when an error occurs and logging run-time information to a log file. +safe_mysqld \- start the mysqld daemon on Unix. .SH SYNOPSIS .B safe_mysqld .RB [ \-\-basedir=\fP\fIpath\fP ] @@ -21,6 +20,9 @@ is the recommended way to start a mysqld daemon on Unix. safe_mysqld adds some s .RB [ \-\-timezone=# ] .RB [ \-\-user=# ] .SH DESCRIPTION +safe_mysqld adds some safety features such as restarting the server when an +error occurs and logging run-time information to a log file. +.BR .TP .BR \-\-basedir=\fP\fIpath \fP .TP diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 1397c14515b..9c0f99aea82 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -41,9 +41,11 @@ void my_b_seek(IO_CACHE *info,my_off_t pos) byte* try_rc_pos; try_rc_pos = info->rc_pos + (pos - info->pos_in_file); if (try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end) + { info->rc_pos = try_rc_pos; - else - flush_io_cache(info); + return; + } + flush_io_cache(info); } info->pos_in_file=pos; info->seek_not_done=1; diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c49ea91a4fc..99eb9e42967 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -68,7 +68,7 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \ client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \ client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \ - client/.libs/mysqlcheck + client/.libs/mysqlcheck client/.libs/mysqlbinlog do if [ -f $i ] then |