mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into mysql.com:/export/space/pekka/ndb/version/my41
This commit is contained in:
unknown 2005-04-14 05:01:44 +02:00
commit d10aba1b0f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -7554,13 +7554,13 @@ void Dblqh::execSCAN_FRAGREQ(Signal* signal)
ndbrequire(max_rows > 0 && max_rows <= MAX_PARALLEL_OP_PER_SCAN); ndbrequire(max_rows > 0 && max_rows <= MAX_PARALLEL_OP_PER_SCAN);
if (!getFragmentrec(signal, fragId)) { if (!getFragmentrec(signal, fragId)) {
errorCode = __LINE__; errorCode = 1231;
goto error_handler; goto error_handler;
}//if }//if
// Verify scan type vs table type (both sides are boolean) // Verify scan type vs table type (both sides are boolean)
if (rangeScan != DictTabInfo::isOrderedIndex(fragptr.p->tableType)) { if (rangeScan != DictTabInfo::isOrderedIndex(fragptr.p->tableType)) {
errorCode = __LINE__; // XXX fix errorCode = 1232;
goto error_handler; goto error_handler;
}//if }//if

2
ndb/src/ndbapi/ndberror.c
View file

@ -320,6 +320,8 @@ ErrorBundle ErrorCodes[] = {
{ 1226, SE, "Table is being dropped" }, { 1226, SE, "Table is being dropped" },
{ 1228, SE, "Cannot use drop table for drop index" }, { 1228, SE, "Cannot use drop table for drop index" },
{ 1229, SE, "Too long frm data supplied" }, { 1229, SE, "Too long frm data supplied" },
{ 1231, SE, "Invalid table or index to scan" },
{ 1232, SE, "Invalid table or index to scan" },
/** /**
* FunctionNotImplemented * FunctionNotImplemented