Backported the fix and the test case for bug #58816 from mysql-5.6 code line.

1 files changed, 7 insertions, 0 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 46f5beb45d2..1f45b1a1e7d 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -2393,6 +2393,13 @@ public:
  */
  virtual void cond_pop() { return; };
  virtual Item *idx_cond_push(uint keyno, Item* idx_cond) { return idx_cond; }
+ /** Reset information about pushed index conditions */
+ virtual void cancel_pushed_idx_cond()
+ {
+   pushed_idx_cond= NULL;
+   pushed_idx_cond_keyno= MAX_KEY;
+   in_range_check_pushed_down= false;
+ }
  virtual bool check_if_incompatible_data(HA_CREATE_INFO *create_info,
 					 uint table_changes)
  { return COMPATIBLE_DATA_NO; }