diff options
author | Igor Babaev <igor@askmonty.org> | 2016-08-31 16:16:54 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2016-08-31 16:16:54 -0700 |
commit | 3fb4f9bb93868ce5c7e385d0545c00755d8e23bd (patch) | |
tree | 8ea1c005920b2ef9d7c7f1114c5433c728751b72 /sql/sql_select.h | |
parent | 670760d504bebdf542df890f4d40f4cd3ff7a2c8 (diff) | |
parent | eb2c1474752a5f743db638d5b06612c9e3f07f74 (diff) | |
download | mariadb-git-3fb4f9bb93868ce5c7e385d0545c00755d8e23bd.tar.gz |
Merge branch '10.2-mdev9197-cons' of github.com:shagalla/server
into branch 10.2-mdev9197.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 24c7e0f9ff7..cde6209cb7e 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -188,7 +188,7 @@ typedef enum_nested_loop_state Next_select_func setup_end_select_func(JOIN *join, JOIN_TAB *tab); int rr_sequential(READ_RECORD *info); int rr_sequential_and_unpack(READ_RECORD *info); - +Item *remove_pushed_top_conjuncts(THD *thd, Item *cond); #include "sql_explain.h" |