Commit cc6c6963 authored by tomas@poseidon.bredbandsbolaget.se's avatar tomas@poseidon.bredbandsbolaget.se
Browse files

Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 

into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
parents 5cdbd24d a3fe485d

sql/sql_binlog.cc

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ void mysql_client_binlog_statement(THD* thd) 
  send_ok(thd);



end:

  thd->rli_fake->clear_tables_to_lock();

  my_free(buf, MYF(MY_ALLOW_ZERO_PTR));

  DBUG_VOID_RETURN;

}

sql/sql_class.cc

+3 −0
Original line number Diff line number Diff line
@@ -870,7 +870,10 @@ THD::~THD() 
#endif  

#ifndef EMBEDDED_LIBRARY

  if (rli_fake)

  {

    delete rli_fake;

    rli_fake= NULL;

  }

#endif



  free_root(&main_mem_root, MYF(0));