bk commit into 4.1 tree (jonas:1.2533)

[jonas]

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@stripped, 2006-08-01 16:56:57+02:00, jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
  into  perch.ndb.mysql.com:/home/jonas/src/41-work
  MERGE: 1.2453.44.15

  ndb/src/kernel/blocks/ERROR_codes.txt@stripped, 2006-08-01 16:56:55+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.17.1.1

  ndb/test/run-test/daily-basic-tests.txt@stripped, 2006-08-01 16:56:55+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.32.1.1

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work/RESYNC

--- 1.33/ndb/test/run-test/daily-basic-tests.txt	2006-08-01 16:57:00 +02:00
+++ 1.34/ndb/test/run-test/daily-basic-tests.txt	2006-08-01 16:57:00 +02:00
@@ -474,6 +474,10 @@
 cmd: testNodeRestart
 args: -n Bug20185 T1
 
+max-time: 1000
+cmd: testIndex
+args: -n Bug21384
+
 # OLD FLEX
 max-time: 500
 cmd: flexBench

--- 1.18/ndb/src/kernel/blocks/ERROR_codes.txt	2006-08-01 16:57:00 +02:00
+++ 1.19/ndb/src/kernel/blocks/ERROR_codes.txt	2006-08-01 16:57:00 +02:00
@@ -6,7 +6,7 @@
 Next DBLQH 5043
 Next DBDICT 6006
 Next DBDIH 7174
-Next DBTC 8037
+Next DBTC 8038
 Next CMVMI 9000
 Next BACKUP 10022
 Next DBUTIL 11002
@@ -281,6 +281,7 @@
 
 8032: No free TC records any more
 
+8037 : Invalid schema version in TCINDXREQ
 
 CMVMI
 -----