diff options
| author | unknown <joreland@mysql.com> | 2005-04-22 13:07:35 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-04-22 13:07:35 +0200 |
| commit | 879bd504280d08589ad3110ccc1b4309c17fef37 (patch) | |
| tree | dde7dd4b56728c8a96288bfc706e9108a23ac480 /ndb/src/kernel/blocks | |
| parent | 4c02417fc808634c29f9ededf7db5af98e8989db (diff) | |
| parent | e0f03a9b950cc3d3ccba3efa627975fb94bb51bb (diff) | |
| download | mariadb-git-879bd504280d08589ad3110ccc1b4309c17fef37.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
Diffstat (limited to 'ndb/src/kernel/blocks')
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 4 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index c29cb7ea101..10a6b30839f 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -7518,13 +7518,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/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 3c229fd1a38..eec1cf8a6c0 100644 --- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -1879,7 +1879,6 @@ void Dbtc::execKEYINFO(Signal* signal) do { if (cfirstfreeDatabuf == RNIL) { jam(); - abort(); seizeDatabuferrorLab(signal); return; }//if |