Commit 02ee7434 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 2596e464 be2a121e

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -176,3 +176,6 @@ repl-tests/test-repl-ts/repl-timestamp.master.reject 
client/.mysqladmin.c.swp

repl-tests/test-repl/sum-wlen-slave.master.reje

support-files/mysql-3.23.28-gamma.spec

repl-tests/test-repl/foo-dump-slave.master.

repl-tests/test-repl/sum-wlen-slave.master.

repl-tests/test-repl/sum-wlen-slave.master.re

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line 
monty@donna.mysql.com

monty@narttu.mysql.fi

sasha@mysql.sashanet.com

serg@serg.mysql.com
 
monty@narttu.mysql.fi

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int MYSQL_LOG::find_first_log(LOG_INFO* linfo, const char* log_name) 


    // if the log entry matches, empty string matching anything

    if (!log_name_len ||

	(log_name_len == length+1 && fname[log_name_len] == '\n' &&

	(log_name_len == length-1 && fname[log_name_len] == '\n' &&

	 !memcmp(fname, log_name, log_name_len)))

    {

      fname[length-1]=0;			// remove last \n

sql/mysqlbinlog.cc

+3 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ Unfortunately, no sweepstakes today, adjusted position to 4\n"); 


static void dump_local_log_entries(const char* logname)

{

  File fd;

  File fd = -1;

  IO_CACHE cache,*file= &cache;

  int rec_count = 0;
@@ -368,6 +368,7 @@ read error", 
    rec_count++;

    delete ev;

  }

  if(fd >= 0)

   my_close(fd, MYF(MY_WME));

  end_io_cache(file);

}

sql/slave.cc

+4 −2
Original line number Diff line number Diff line
@@ -756,8 +756,10 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	sql_exchange ex((char*)lev->fname, lev->sql_ex.opt_flags &&

			DUMPFILE_FLAG );

	String field_term(&lev->sql_ex.field_term, 1),

	  enclosed(&lev->sql_ex.enclosed, 1), line_term(&lev->sql_ex.line_term,1),

	  escaped(&lev->sql_ex.escaped, 1), line_start(&lev->sql_ex.line_start, 1);

	  enclosed(&lev->sql_ex.enclosed, 1),

	  line_term(&lev->sql_ex.line_term,1),

	  escaped(&lev->sql_ex.escaped, 1),

	  line_start(&lev->sql_ex.line_start, 1);

	    

	ex.field_term = &field_term;

	if(lev->sql_ex.empty_flags & FIELD_TERM_EMPTY)