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

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

Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
521b0b6d · antony@ltantony.mysql.com · fb372588 · 91e04912 · 521b0b6d · 521b0b6d
Commit 521b0b6d authored May 07, 2005 by antony@ltantony.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

sql/sql_base.cc sql/sql_base.cc +1 -0

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/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

--- a/sql/sql_base.cc
+++ b/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);