Merge marko@build.mysql.com:/home/bk/mysql-4.1

into hundin.mysql.fi:/home/marko/j/mysql-4.1

configure.in

@@ -15,8 +15,8 @@ SHARED_LIB_VERSION=14:0:0
 # ndb version
 NDB_VERSION_MAJOR=3
 NDB_VERSION_MINOR=5
-NDB_VERSION_BUILD=1
-NDB_VERSION_STATUS=beta
+NDB_VERSION_BUILD=2
+NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

ndb/src/common/util/version.c

@@ -37,13 +37,19 @@ Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) {
 
 char * getVersionString(Uint32 version, char * status) {
   char buff[100];
-  snprintf(buff, sizeof(buff),
-	   "Version %d.%d.%d (%s)",
-	   getMajor(version),
-	   getMinor(version),
-	   getBuild(version),
-	   status);
-
+  if (status && status[0] != 0)
+    snprintf(buff, sizeof(buff),
+	     "Version %d.%d.%d (%s)",
+	     getMajor(version),
+	     getMinor(version),
+	     getBuild(version),
+	     status);
+  else
+    snprintf(buff, sizeof(buff),
+	     "Version %d.%d.%d",
+	     getMajor(version),
+	     getMinor(version),
+	     getBuild(version));
   return strdup(buff);
 }
 
@@ -63,6 +69,7 @@ struct NdbUpGradeCompatible {
 
 #ifndef TEST_VERSION
 struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
+  { MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact },
   { 0, 0, UG_Null }
 };
 

sql/ha_ndbcluster.cc

@@ -1206,7 +1206,8 @@ inline int ha_ndbcluster::next_result(byte *buf)
 	{
 	  if  (execute_commit(this,trans) != 0)
 	    DBUG_RETURN(ndb_err(trans));
-	  DBUG_ASSERT(trans->restart() == 0);
+	  int res= trans->restart();
+	  DBUG_ASSERT(res == 0);
 	}
 	ops_pending= 0;
       }
@@ -1644,7 +1645,8 @@ int ha_ndbcluster::write_row(byte *record)
 	no_uncommitted_rows_execute_failure();
 	DBUG_RETURN(ndb_err(trans));
       }
-      DBUG_ASSERT(trans->restart() == 0);
+      int res= trans->restart();
+      DBUG_ASSERT(res == 0);
     }
   }
   if ((has_auto_increment) && (skip_auto_increment))
@@ -2281,7 +2283,8 @@ int ha_ndbcluster::rnd_init(bool scan)
   {
     if (!scan)
       DBUG_RETURN(1);
-    DBUG_ASSERT(cursor->restart() == 0);
+    int res= cursor->restart();
+    DBUG_ASSERT(res == 0);
   }
   index_init(table->primary_key);
   DBUG_RETURN(0);