From: Date: October 24 2007 11:30am
Subject: bk commit into 5.0 tree (knielsen:1.2489) BUG#31810
List-Archive: http://lists.mysql.com/commits/36244
X-Bug: 31810
Message-Id: <1193218247.0@ymer>

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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@stripped, 2007-10-24 11:30:38+02:00, knielsen@ymer.(none) +1 -0
  BUG#31810: Potential infinite loop with autoincrement failures in ndb
  
  Fix extra semicolon causing if-statement to be disabled.

  sql/ha_ndbcluster.cc@stripped, 2007-10-24 11:30:36+02:00, knielsen@ymer.(none) +2 -2
    Fix extra semicolon causing if-statement to be disabled.

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/loke/home/knielsen/devel/mysql-5.0-ndb

--- 1.317/sql/ha_ndbcluster.cc	2007-10-24 11:30:45 +02:00
+++ 1.318/sql/ha_ndbcluster.cc	2007-10-24 11:30:45 +02:00
@@ -2302,7 +2302,7 @@ int ha_ndbcluster::write_row(byte *recor
                                      auto_value, 1) == -1)
       {
         if (--retries &&
-            ndb->getNdbError().status == NdbError::TemporaryError);
+            ndb->getNdbError().status == NdbError::TemporaryError)
         {
           my_sleep(retry_sleep);
           continue;
@@ -4862,7 +4862,7 @@ ulonglong ha_ndbcluster::get_auto_increm
                                    auto_value, cache_size, step, start))
     {
       if (--retries &&
-          ndb->getNdbError().status == NdbError::TemporaryError);
+          ndb->getNdbError().status == NdbError::TemporaryError)
       {
         my_sleep(retry_sleep);
         continue;