Commit db82d30b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix for make dist 

Made replication test portable
Fixed buffer overrun bug in replication
parent 4dd46e34

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
INCLUDES =			-I$(srcdir)/../include \

				-I../include -I$(srcdir)/.. -I$(top_srcdir) \

				-I..

noinst_HEADERS =		client_priv.h

LIBS =				@CLIENT_LIBS@

LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog

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_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysql_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES)

mysql-test/t/rpl000017-slave.sh

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ master-bin.001 
4

127.0.0.1

replicate

aaaaaaaaaaaaaaab

9306

aaaaaaaaaaaaaaabthispartofthepasswordisnotused

$MASTER_MYPORT

1

EOF

sql/slave.cc

+4 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f, 
  }

  else if (default_val)

  {

    strmake(var,  default_val, max_size);

    strmake(var,  default_val, max_size-1);

    return 0;

  }

  return 1;
@@ -530,14 +530,14 @@ int init_master_info(MASTER_INFO* mi) 
    }



    mi->log_file_name[length-1]= 0; // kill \n

    char buf[FN_REFLEN];

    if(!my_b_gets(&mi->file, buf, sizeof(buf)))

    /* Reuse fname buffer */

    if(!my_b_gets(&mi->file, fname, sizeof(fname)))

    {

      msg="Error reading log file position from master info file";

      goto error;

    }

    mi->pos = strtoull(fname,(char**) 0, 10);



    mi->pos = strtoull(buf,(char**) 0, 10);

    mi->fd = fd;

    if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file,

			     master_host) ||

strings/strmake.c

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


    strmake(dst,src,length) moves length characters, or until end, of src to

    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>