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

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


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged

BitKeeper/etc/logging_ok

@@ -15,6 +15,7 @@ ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
 anjuta@arthur.local
 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

@@ -1488,6 +1488,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);