diff options
| author | pekka@sama.ndb.mysql.com <> | 2008-02-01 00:07:15 +0100 |
|---|---|---|
| committer | pekka@sama.ndb.mysql.com <> | 2008-02-01 00:07:15 +0100 |
| commit | 60446a30c93aaee250c56b4a3f9a04afcb568ba0 (patch) | |
| tree | 4caa91ceca2035ce1141bf8427617240388e5261 /storage/ndb | |
| parent | f67d3aa67e9f2aacae141a887a73d26392a6a35b (diff) | |
| download | mariadb-git-60446a30c93aaee250c56b4a3f9a04afcb568ba0.tar.gz | |
ndb - bug#34107 - post-merge
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 1 | ||||
| -rw-r--r-- | storage/ndb/test/run-test/daily-basic-tests.txt | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 2ebf09c42ce..363e25fc519 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -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 --git a/storage/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt index 1aee1555f00..99eab2bba46 100644 --- a/storage/ndb/test/run-test/daily-basic-tests.txt +++ b/storage/ndb/test/run-test/daily-basic-tests.txt @@ -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: |