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

worked around one bug in the new symlink code, but hit another 

test case included ( drop) - currently fails, along with rpl000009
parent 9fde9619

mysql-test/r/drop.result

+2 −0
Original line number Diff line number Diff line 
n

1

n

4

mysql-test/t/drop.test

+14 −0
Original line number Diff line number Diff line
@@ -10,3 +10,17 @@ insert into t1 values(2); 
create table t1(n int);

drop table t1;

select * from t1;



#now test for a bug in drop database - it is important that the name

#of the table is the same as the name of the database - in the original

#code this triggered a bug

drop database if exists foo;

create database foo;

drop database if exists foo;

create database foo;

create table foo.foo (n int);

insert into foo.foo values (4);

select * from foo.foo;

drop database if exists foo;

create database foo;

drop database foo;

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ int init_master_info(MASTER_INFO* mi) 
  MY_STAT stat_area;

  char fname[FN_REFLEN+128];

  const char *msg;

  fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32);

  fn_format(fname, master_info_file, mysql_data_home, "", 4+32);



  // we need a mutex while we are changing master info parameters to

  // keep other threads from reading bogus info

sql/sql_repl.cc

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ void reset_slave() 
    pthread_mutex_unlock(&LOCK_slave);

  

  end_master_info(&glob_mi);

  fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32);

  fn_format(fname, master_info_file, mysql_data_home, "", 4+32);

  if(my_stat(fname, &stat_area, MYF(0)))

    if(my_delete(fname, MYF(MY_WME)))

        return;