diff options
| author | Keith Bostic <keith.bostic@mongodb.com> | 2016-05-03 12:00:07 -0400 |
|---|---|---|
| committer | Keith Bostic <keith.bostic@mongodb.com> | 2016-05-03 12:00:07 -0400 |
| commit | 6ef4c0c631514916c8b4bd7aed12913647044626 (patch) | |
| tree | c28608cc5d4aa08abbe50b909d56569b5264f987 /src/cursor | |
| parent | 92497038c06e5ef7e640434fe2b4a1166f644174 (diff) | |
| download | mongo-6ef4c0c631514916c8b4bd7aed12913647044626.tar.gz | |
WT-2609: Incorrect "skips API_END call" error. (#2713)
A comment in cursor/cur_join.c contains "return WT_NOTFOUND", which is
triggering a complaint from the scripts that check for returns that skip
error labels.
Diffstat (limited to 'src/cursor')
| -rw-r--r-- | src/cursor/cur_join.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cursor/cur_join.c b/src/cursor/cur_join.c index 675d4851b38..fd7de53c981 100644 --- a/src/cursor/cur_join.c +++ b/src/cursor/cur_join.c @@ -1110,10 +1110,14 @@ __curjoin_next(WT_CURSOR *cursor) c = cjoin->main; __wt_cursor_set_raw_key(c, iter->curkey); - /* A failed search is not expected, don't return WT_NOTFOUND. */ + /* + * A failed search is not expected, convert WT_NOTFOUND into a + * generic error. + */ if ((ret = c->search(c)) == WT_NOTFOUND) ret = WT_ERROR; WT_ERR(ret); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); } else if (ret == WT_NOTFOUND && (tret = __curjoin_iter_close_all(iter)) != 0) |