Merge

1 files changed, 9 insertions, 1 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 8ad49456bf6..e9bc6652443 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -268,6 +268,9 @@ typedef struct st_table TABLE;
 struct st_foreign_key_info;
 typedef struct st_foreign_key_info FOREIGN_KEY_INFO;
 
+/* Forward declaration for Condition Pushdown to Handler (CPDH) */
+typedef struct Item COND;
+
 typedef struct st_ha_check_opt
 {
   ulong sort_buffer_size;
@@ -601,7 +604,6 @@ public:
     *engine_callback= 0;
     return 1;
   }
- 
  /*
   RETURN
     true  Primary key (if there is one) is clustered key covering all fields
@@ -613,6 +615,12 @@ public:
  {
    return memcmp(ref1, ref2, ref_length);
  }
+ 
+ /*
+   Condition pushdown to storage engines
+ */
+ virtual const COND *cond_push(const COND *cond) { return cond; };
+ virtual void cond_pop() { return; };
 };
 
 	/* Some extern variables used with handlers */