Commit d10aba1b authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/export/space/pekka/ndb/version/my41
parents 82231c24 41403df4

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7554,13 +7554,13 @@ void Dblqh::execSCAN_FRAGREQ(Signal* signal) 








  ndbrequire(max_rows > 0 && max_rows <= MAX_PARALLEL_OP_PER_SCAN);









  if (!getFragmentrec(signal, fragId)) {









    errorCode = __LINE__;









    errorCode = 1231;









    goto error_handler;









  }//if

















  // Verify scan type vs table type (both sides are boolean)









  if (rangeScan != DictTabInfo::isOrderedIndex(fragptr.p->tableType)) {









    errorCode = __LINE__;       // XXX fix









    errorCode = 1232;









    goto error_handler;









  }//if









  
































ndb/src/ndbapi/ndberror.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -320,6 +320,8 @@ ErrorBundle ErrorCodes[] = {







  { 1226, SE, "Table is being dropped" },









  { 1228, SE, "Cannot use drop table for drop index" },









  { 1229, SE, "Too long frm data supplied" },









  { 1231, SE, "Invalid table or index to scan" },









  { 1232, SE, "Invalid table or index to scan" },



















  /**









   * FunctionNotImplemented