Commit 27636d56 authored by aelkin/elkin@koti.dsl.inet.fi's avatar aelkin/elkin@koti.dsl.inet.fi
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade
parents 628b4628 571f8be4

mysql-test/t/rpl_dual_pos_advance.test

+0 −6
Original line number Diff line number Diff line
@@ -106,9 +106,3 @@ connection slave; 
sync_with_master;



# End of 4.1 tests
 


# Cleanup

# The A->B->A replication causes the master to start writing relay logs

# in var/run, remove them

remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.000001;

remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.index;

mysql-test/t/rpl_temporary.test

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ select * from t1; 
connection master; 

drop table t1;



--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql



# Delete the anonymous users

source include/delete_anonymous_users.inc;

sql/log.cc

+4 −7
Original line number Diff line number Diff line
@@ -448,13 +448,10 @@ const char *MYSQL_LOG::generate_name(const char *log_name, 
{

  if (!log_name || !log_name[0])

  {

    /*

      TODO: The following should be using fn_format();  We just need to

      first change fn_format() to cut the file name if it's too long.

    */

    strmake(buff, pidfile_name,FN_REFLEN-5);

    strmov(fn_ext(buff),suffix);

    return (const char *)buff;

    strmake(buff, pidfile_name, FN_REFLEN - strlen(suffix) - 1);

    return (const char *)

      fn_format(buff, buff, "", suffix, MYF(MY_REPLACE_EXT|MY_REPLACE_DIR));



  }

  // get rid of extension if the log is binary to avoid problems

  if (strip_ext)