database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Small safety fix

Browse Source 
Docs/manual.texi:
  Cleanup
extra/resolveip.c:
  Portability fix
man/safe_mysqld.1:
  Cleanup
mysys/mf_iocache2.c:
  Safety fix
scripts/make_binary_distribution.sh:
  Add mysqlbinlog
This commit is contained in:
unknown
2001-11-28 02:24:22 +02:00
parent 312e5e82c0
commit aaed141aa6
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Docs/manual.texi
View File

@ -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

2
extra/resolveip.c
View File

@ -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

8
man/safe_mysqld.1
View File

@ -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 .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
.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

6
mysys/mf_iocache2.c
View File

@ -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;

2
scripts/make_binary_distribution.sh
View File

@ -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