summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <antony@ltantony.mysql.com>2005-05-06 14:42:28 +0100
committerunknown <antony@ltantony.mysql.com>2005-05-06 14:42:28 +0100
commit079910b6f1bc7cbb1a9425bf0e49775e4c41d365 (patch)
tree308e1c026a4ee1ec14e5d410eaf4c2a16df9fe59
parentede028b0638239f61812e3a0f226ca7adf451ed7 (diff)
downloadmariadb-git-079910b6f1bc7cbb1a9425bf0e49775e4c41d365.tar.gz
Bug#6616
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT Infinite loop caused by missing update to thd version. sql/sql_base.cc: Bug#6616 thd version needs to be updated before reopening tables to prevent an infinite loop. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/sql_base.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index bf0dfb9e31d..5a34dbbb1d8 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -9,6 +9,7 @@ acurtis@pcgem.rdg.cyberkinetica.com
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.homeunix.net
arjen@bitbike.com
arjen@co3064164-a.bitbike.com
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ddc81053357..c8eb2338294 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1265,6 +1265,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);