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

Fix for make dist

Browse Source 
Made replication test portable
Fixed buffer overrun bug in replication


client/Makefile.am:
  Fix for make dist
mysql-test/t/rpl000017-slave.sh:
  Made replication test portable
sql/slave.cc:
  Fixed buffer overrun bug
strings/strmake.c:
  More documentation
This commit is contained in:
unknown
2001-10-02 22:21:14 +03:00
parent 777df00444
commit abf1b80cf4
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/Makefile.am
View File

@ -19,13 +19,13 @@
INCLUDES = -I$(srcdir)/../include \ INCLUDES = -I$(srcdir)/../include \
-I../include -I$(srcdir)/.. -I$(top_srcdir) \ -I../include -I$(srcdir)/.. -I$(top_srcdir) \
-I.. -I..
noinst_HEADERS = client_priv.h
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
mysqldump mysqlimport mysqltest mysqlbinlog mysqldump mysqlimport mysqltest mysqlbinlog
noinst_PROGRAMS = insert_test select_test thread_test noinst_PROGRAMS = insert_test select_test thread_test
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
client_priv.h
mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS) mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
mysql_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysql_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)

4
mysql-test/t/rpl000017-slave.sh
View File

@ -3,7 +3,7 @@ master-bin.001
4 4
127.0.0.1 127.0.0.1
replicate replicate
aaaaaaaaaaaaaaab aaaaaaaaaaaaaaabthispartofthepasswordisnotused
9306 $MASTER_MYPORT
1 1
EOF EOF

8
sql/slave.cc
View File

@ -299,7 +299,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f,
} }
else if (default_val) else if (default_val)
{ {
strmake(var, default_val, max_size); strmake(var, default_val, max_size-1);
return 0; return 0;
} }
return 1; return 1;
@ -530,14 +530,14 @@ int init_master_info(MASTER_INFO* mi)
} }
mi->log_file_name[length-1]= 0; // kill \n mi->log_file_name[length-1]= 0; // kill \n
char buf[FN_REFLEN]; /* Reuse fname buffer */
if(!my_b_gets(&mi->file, buf, sizeof(buf))) if(!my_b_gets(&mi->file, fname, sizeof(fname)))
{ {
msg="Error reading log file position from master info file"; msg="Error reading log file position from master info file";
goto error; goto error;
} }
mi->pos = strtoull(fname,(char**) 0, 10);
mi->pos = strtoull(buf,(char**) 0, 10);
mi->fd = fd; mi->fd = fd;
if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file, if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file,
master_host) || master_host) ||

3
strings/strmake.c
View File

@ -22,7 +22,8 @@
strmake(dst,src,length) moves length characters, or until end, of src to strmake(dst,src,length) moves length characters, or until end, of src to
dst and appends a closing NUL to dst. dst and appends a closing NUL to dst.
strmake() returns pointer to closing null; Note that is strlen(src) >= length then dst[length] will be set to \0
strmake() returns pointer to closing null
*/ */
#include <global.h> #include <global.h>