bk commit into 5.1 tree (tomas:1.1818)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1818 05/04/23 17:44:31 tomas@stripped +3 -0
  Ndberr.cpp, NdbDictionaryImpl.hpp, NdbDictionaryImpl.cpp:
    fixed retry bug on temporary error

  ndb/src/ndbapi/Ndberr.cpp
    1.12 05/04/23 17:42:51 tomas@stripped +7 -0
    fixed retry bug on temporary error

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.36 05/04/23 17:42:51 tomas@stripped +1 -1
    fixed retry bug on temporary error

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.81 05/04/23 17:42:51 tomas@stripped +2 -1
    fixed retry bug on temporary error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325

--- 1.80/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-04-14 14:19:39 +02:00
+++ 1.81/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-04-23 17:42:51 +02:00
@@ -1038,7 +1038,8 @@
     
     if ( temporaryMask == -1)
     {
-      if (m_error.status ==  NdbError::TemporaryError)
+      const NdbError &error= getNdbError();
+      if (error.status ==  NdbError::TemporaryError)
 	continue;
     }
     else if ( (temporaryMask & m_error.code) != 0 ) {

--- 1.35/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2005-04-11 20:47:59 +02:00
+++ 1.36/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2005-04-23 17:42:51 +02:00
@@ -320,7 +320,7 @@
   static int create_index_obj_from_table(NdbIndexImpl ** dst, 
 					 NdbTableImpl* index_table,
 					 const NdbTableImpl* primary_table);
-  
+  const NdbError &getNdbError() const;  
   NdbError & m_error;
 private:
   Uint32 m_reference;

--- 1.11/ndb/src/ndbapi/Ndberr.cpp	2005-01-06 21:12:58 +01:00
+++ 1.12/ndb/src/ndbapi/Ndberr.cpp	2005-04-23 17:42:51 +02:00
@@ -80,3 +80,10 @@
   update(m_error);
   return m_error;
 }
+
+const
+NdbError &
+NdbDictInterface::getNdbError() const {
+  update(m_error);
+  return m_error;
+}