Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/ram/work/4.1

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
7217b4e9 · ramil@mysql.com · bec93d48 · 91e04912 · 7217b4e9 · 7217b4e9
Commit 7217b4e9 authored May 07, 2005 by ramil@mysql.com
Hide 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
@@ -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

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