Commit 60446a30 authored by pekka@sama.ndb.mysql.com's avatar pekka@sama.ndb.mysql.com
Browse files

ndb - bug#34107 - post-merge

parent f67d3aa6

storage/ndb/src/ndbapi/ndberror.c

+1 −0
Original line number Diff line number Diff line
@@ -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" },

storage/ndb/test/run-test/daily-basic-tests.txt

+4 −4
Original line number Diff line number Diff line
@@ -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: