diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-10-28 04:07:11 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-10-28 04:07:11 -0700 |
| commit | 4b4dfd57f570b25c87133f16ead3bd83e6c8f73b (patch) | |
| tree | 1367ad13b5cc800dc9e1d436e0c5ff44da92cd73 /include | |
| parent | 2162704829a08b3ebd41e2cdf6a6b5f7ea6bcc6d (diff) | |
| parent | adc1f2f4c939c15ad5efd37633332560456cd4fd (diff) | |
| download | mariadb-git-4b4dfd57f570b25c87133f16ead3bd83e6c8f73b.tar.gz | |
Merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_compare.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_compare.h b/include/my_compare.h index 7e886d1e0dc..058d6b6d94a 100644 --- a/include/my_compare.h +++ b/include/my_compare.h @@ -103,6 +103,8 @@ extern HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, const uchar *a); if we're scanning "t.key BETWEEN 10 AND 20" and got a "t.key=21" tuple (the engine should stop scanning and return HA_ERR_END_OF_FILE right away). + 3=ICP_ABORTED_BY_USER - engine must stop scanning and should return + HA_ERR_ABORTED_BY_USER right away -1= ICP_ERROR - Reserved for internal errors in engines. Should not be returned by index_cond_func_xxx */ @@ -111,7 +113,8 @@ typedef enum icp_result { ICP_ERROR=-1, ICP_NO_MATCH=0, ICP_MATCH=1, - ICP_OUT_OF_RANGE=2 + ICP_OUT_OF_RANGE=2, + ICP_ABORTED_BY_USER=3, } ICP_RESULT; |