summaryrefslogtreecommitdiff
path: root/include/my_compare.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-06-01 20:49:37 -0700
committerIgor Babaev <igor@askmonty.org>2011-06-01 20:49:37 -0700
commit6dab04bda02cab4510f4c594c0625e0801a5a7b7 (patch)
treecf6f8865cb56ad38f44206cc90934b40d69c60a5 /include/my_compare.h
parent8bf69ab7bf71ee8e1cbed98d20b04ebf1e5567c1 (diff)
parent9a1e54658ebd073978f36bd535754768641f70a5 (diff)
downloadmariadb-git-6dab04bda02cab4510f4c594c0625e0801a5a7b7.tar.gz
Merge.
Diffstat (limited to 'include/my_compare.h')
-rw-r--r--include/my_compare.h5
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;