Commit b0bc3da1 authored by unknown's avatar unknown
Browse files

Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616 

into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged
parents 6b819860 079910b6

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ administrador@light.hegel.local 
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com

antony@ltantony.dsl-verizon.net

antony@ltantony.mysql.com

antony@ltantony.rdg.cyberkinetica.com

antony@ltantony.rdg.cyberkinetica.homeunix.net

arjen@bitbike.com

sql/sql_base.cc

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ bool wait_for_tables(THD *thd) 
  {

    /* Now we can open all tables without any interference */

    thd->proc_info="Reopen tables";

    thd->version= refresh_version;

    result=reopen_tables(thd,0,0);

  }

  pthread_mutex_unlock(&LOCK_open);