bk commit into 4.1 tree (joreland:1.2329) BUG#11942

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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.2329 05/07/20 12:39:45 joreland@stripped +2 -0
  bug#11942 - ndb backup with parallell DDL
    add testcase to autotest

  ndb/test/run-test/daily-basic-tests.txt
    1.21 05/07/20 12:39:42 joreland@stripped +4 -0
    add test case

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.35 05/07/20 12:39:42 joreland@stripped +1 -1
    remove ;

# 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:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-4.1

--- 1.20/ndb/test/run-test/daily-basic-tests.txt	2005-06-07 15:10:54 +02:00
+++ 1.21/ndb/test/run-test/daily-basic-tests.txt	2005-07-20 12:39:42 +02:00
@@ -54,6 +54,10 @@
 cmd: atrt-testBackup
 args: -n BackupOne T1 T6 T3 I3
 
+max-time: 600
+cmd: atrt-testBackup
+args: -n BackupDDL T1
+
 # BASIC FUNCTIONALITY
 max-time: 500
 cmd: testBasic

--- 1.34/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-20 11:48:45 +02:00
+++ 1.35/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-07-20 12:39:42 +02:00
@@ -2800,7 +2800,7 @@
     ndbrequire(tablePtr.p->tabState == TableRecord::DEFINED);
     tablePtr.p->tabState = TableRecord::BACKUP_ONGOING;
   }
-  else if(tablePtr.p->tabState == TableRecord::BACKUP_ONGOING);
+  else if(tablePtr.p->tabState == TableRecord::BACKUP_ONGOING)
   {
     tablePtr.p->tabState = TableRecord::DEFINED;
   }