summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorjonas@eel.(none) <>2005-08-18 14:07:31 +0200
committerjonas@eel.(none) <>2005-08-18 14:07:31 +0200
commit96f719818c1cc1c0402970e13cd4ea370fd0d7e5 (patch)
tree8d78347bfd9f5eefa96e3dd2f7a0233ef59c2b3b /sql/ha_ndbcluster.cc
parent6e84ca33d9b5fff45ac0d940d47606b4e3a455a0 (diff)
parent3b68047235d6a7bd8816672fdc7bad9a4de1bb18 (diff)
downloadmariadb-git-96f719818c1cc1c0402970e13cd4ea370fd0d7e5.tar.gz
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-4.1-push
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 3109c314f6c..d1de0bd100e 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -3258,7 +3258,10 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
DBUG_PRINT("info", ("Table schema version: %d",
tab->getObjectVersion()));
// Check if thread has stale local cache
- if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
+ // New transaction must not use old tables... (trans != 0)
+ // Running might...
+ if ((trans && tab->getObjectStatus() != NdbDictionary::Object::Retrieved)
+ || tab->getObjectStatus() == NdbDictionary::Object::Invalid)
{
invalidate_dictionary_cache(FALSE);
if (!(tab= dict->getTable(m_tabname, &tab_info)))