Commit e4bdf260 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

Small safety fix

parent 66a31433
...@@ -41178,8 +41178,7 @@ of the following flags in very special circumstances: ...@@ -41178,8 +41178,7 @@ of the following flags in very special circumstances:
A @code{MYSQL*} connection handle if the connection was successful, A @code{MYSQL*} connection handle if the connection was successful,
@code{NULL} if the connection was unsuccessful. For a successful connection, @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 the return value is the same as the value of the first parameter.
pass @code{NULL} for that parameter.
@subsubheading Errors @subsubheading Errors
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#include <global.h> #include <global.h>
#include <m_ctype.h> #include <m_ctype.h>
#include <my_sys.h> #include <my_sys.h>
#ifndef SCO
#include <m_string.h> #include <m_string.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifndef HAVE_BROKEN_NETINET_INCLUDES #ifndef HAVE_BROKEN_NETINET_INCLUDES
......
.TH SAFE_MYSQLD 1 "19 December 2000" .TH SAFE_MYSQLD 1 "19 December 2000" "safe_mysqld (mysql)" mysql.com
.SH NAME .SH NAME
.BR safe_mysqld safe_mysqld \- start the mysqld daemon on Unix.
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.
.SH SYNOPSIS .SH SYNOPSIS
.B safe_mysqld .B safe_mysqld
.RB [ \-\-basedir=\fP\fIpath\fP ] .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 ...@@ -21,6 +20,9 @@ is the recommended way to start a mysqld daemon on Unix. safe_mysqld adds some s
.RB [ \-\-timezone=# ] .RB [ \-\-timezone=# ]
.RB [ \-\-user=# ] .RB [ \-\-user=# ]
.SH DESCRIPTION .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 .TP
.BR \-\-basedir=\fP\fIpath \fP .BR \-\-basedir=\fP\fIpath \fP
.TP .TP
......
...@@ -41,9 +41,11 @@ void my_b_seek(IO_CACHE *info,my_off_t pos) ...@@ -41,9 +41,11 @@ void my_b_seek(IO_CACHE *info,my_off_t pos)
byte* try_rc_pos; byte* try_rc_pos;
try_rc_pos = info->rc_pos + (pos - info->pos_in_file); try_rc_pos = info->rc_pos + (pos - info->pos_in_file);
if (try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end) if (try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end)
{
info->rc_pos = try_rc_pos; info->rc_pos = try_rc_pos;
else return;
flush_io_cache(info); }
flush_io_cache(info);
} }
info->pos_in_file=pos; info->pos_in_file=pos;
info->seek_not_done=1; info->seek_not_done=1;
......
...@@ -68,7 +68,7 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \ ...@@ -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/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \ client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \ client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \
client/.libs/mysqlcheck client/.libs/mysqlcheck client/.libs/mysqlbinlog
do do
if [ -f $i ] if [ -f $i ]
then then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment