diff options
| author | unknown <pekka@mysql.com> | 2005-04-14 05:01:44 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-04-14 05:01:44 +0200 |
| commit | d10aba1b0fc2f86fb6e9ee1e6d1093bb04187c2a (patch) | |
| tree | 5176c6918eda070d481baa72f3a8b1f6efcfa8ef /ndb | |
| parent | 82231c24c482f740452091b68751341b19060135 (diff) | |
| parent | 41403df45233aa95477ad3e52362c9502db57d35 (diff) | |
| download | mariadb-git-d10aba1b0fc2f86fb6e9ee1e6d1093bb04187c2a.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 4 | ||||
| -rw-r--r-- | ndb/src/ndbapi/ndberror.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index c79f4dfc6c7..3358593b150 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -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 diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c index d4ad9cd6f1c..94e1aeb5545 100644 --- a/ndb/src/ndbapi/ndberror.c +++ b/ndb/src/ndbapi/ndberror.c @@ -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 |