summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-02-21 20:51:56 +0100
committerSergei Golubchik <sergii@pisem.net>2012-02-21 20:51:56 +0100
commitedab37cd680ebcca999d989c34251f6be1115c54 (patch)
tree9a960e6324916997d8efa87ce8d48d099d78cab8 /sql/handler.h
parent5bf311e1e853457c31dbadd3d130b2569a867d80 (diff)
parent446554a15bd84f39ec4a8163e9f4456fa9be8fb2 (diff)
downloadmariadb-git-edab37cd680ebcca999d989c34251f6be1115c54.tar.gz
5.3 merge
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index b52ee6a7279..0ff1a8db01d 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1638,6 +1638,8 @@ public:
{}
};
+extern "C" enum icp_result handler_index_cond_check(void* h_arg);
+
uint calculate_key_len(TABLE *, uint, const uchar *, key_part_map);
/*
bitmap with first N+1 bits set
@@ -2857,6 +2859,8 @@ public:
{ return ht; }
inline int ha_write_tmp_row(uchar *buf);
inline int ha_update_tmp_row(const uchar * old_data, uchar * new_data);
+
+ friend enum icp_result handler_index_cond_check(void* h_arg);
};
#include "multi_range_read.h"