summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-03-07 17:38:47 +0200
committerMichael Widenius <monty@askmonty.org>2012-03-07 17:38:47 +0200
commitaba6d06c34201c672f083298650d96da666cb173 (patch)
treed27752de833bb2c26c18a148c6855dfbbdad7711 /sql/handler.h
parent18c51eee3557ecc61d69778adb6c78c0fae4d496 (diff)
downloadmariadb-git-aba6d06c34201c672f083298650d96da666cb173.tar.gz
Upgraded sphinx to version 2.0.4
Fixed memory leaks and compiler warnings in ha_sphinx.cc Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used mysql-test/suite/sphinx/sphinx.result: Added testing of pushdown conditions and sphinx status variables. mysql-test/suite/sphinx/sphinx.test: Added testing of pushdown conditions and sphinx status variables. mysql-test/suite/sphinx/suite.pm: Print version number if sphinx version is too old. sql/handler.h: Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used sql/sql_base.cc: Added 'thd' argument to check_unused() to be able to set 'entry->in_use' if we call handler->extra(). This was needed as sphinx (and possible other storage engines) assumes that 'in_use' is set if handler functions are called. sql/sql_select.cc: Test if handler is forcing pushdown condition to be used. storage/sphinx/ha_sphinx.cc: Updated to version 2.0.4 Fixed memory leaks and compiler warnings. storage/sphinx/ha_sphinx.h: Updated to version 2.0.4 storage/sphinx/snippets_udf.cc: Updated to version 2.0.4
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 0ff1a8db01d..d56e3242ddd 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -176,6 +176,19 @@
#define HA_RECORD_MUST_BE_CLEAN_ON_WRITE (LL(1) << 41)
/*
+ Table condition pushdown must be performed regardless of
+ 'engine_condition_pushdown' setting.
+
+ This flag is aimed at storage engines that come with "special" predicates
+ that can only be evaluated inside the storage engine.
+ For example, when one does
+ select * from sphinx_table where query='{fulltext_query}'
+ then the "query=..." condition must be always pushed down into storage
+ engine.
+*/
+#define HA_MUST_USE_TABLE_CONDITION_PUSHDOWN (LL(1) << 42)
+
+/*
Set of all binlog flags. Currently only contain the capabilities
flags.
*/