bk commit into 5.1 tree (pekka:1.2671) BUG#34107

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka.  When pekka 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, 2008-02-01 00:07:15+01:00, pekka@stripped +2 -0
  ndb - bug#34107 - post-merge

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2008-01-31 15:23:18+01:00,
pekka@stripped +1 -0
    post-merge

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2008-01-31 23:49:22+01:00,
pekka@stripped +4 -4
    enable testInterpreter

diff -Nrup a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
--- a/storage/ndb/src/ndbapi/ndberror.c	2008-01-31 14:45:46 +01:00
+++ b/storage/ndb/src/ndbapi/ndberror.c	2008-01-31 15:23:18 +01:00
@@ -314,6 +314,7 @@ ErrorBundle ErrorCodes[] = {
   { 242,  DMEC, AE, "Zero concurrency in scan"},
   { 244,  DMEC, AE, "Too high concurrency in scan"},
   { 269,  DMEC, AE, "No condition and attributes to read in scan"},
+  { 874,  DMEC, AE, "Too much attrinfo (e.g. scan filter) for scan in tuple manager" },
   { 4600, DMEC, AE, "Transaction is already started"},
   { 4601, DMEC, AE, "Transaction is not started"},
   { 4602, DMEC, AE, "You must call getNdbOperation before executeScan" },
diff -Nrup a/storage/ndb/test/run-test/daily-basic-tests.txt
b/storage/ndb/test/run-test/daily-basic-tests.txt
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2008-01-31 23:45:43 +01:00
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2008-01-31 23:49:22 +01:00
@@ -744,10 +744,10 @@ max-time: 1000
 cmd: testNdbApi
 args: -n Bug28443
 
-#max-time: 500
-#cmd: testInterpreter
-#args: T1 
-#
+max-time: 500
+cmd: testInterpreter
+args: T1 
+
 max-time: 150000
 cmd: testOperations
 args: