Don't include ha_clustrix_pushdown.cc file in ha_clustrix.cc.

storage/clustrixdb/CMakeLists.txt

@@ -11,7 +11,7 @@ ENDIF()
 
 SET(CLUSTRIXDB_PLUGIN_STATIC  "clustrixdb")
 SET(CLUSTRIXDB_PLUGIN_DYNAMIC "ha_clustrixdb")
-SET(CLUSTRIXDB_SOURCES ha_clustrixdb.cc clustrix_connection.cc)
+SET(CLUSTRIXDB_SOURCES ha_clustrixdb.cc clustrix_connection.cc ha_clustrixdb_pushdown.cc)
 MYSQL_ADD_PLUGIN(clustrixdb ${CLUSTRIXDB_SOURCES} STORAGE_ENGINE)
 
 IF(MSVC)

storage/clustrixdb/ha_clustrixdb.cc

@@ -5,6 +5,7 @@ Copyright (c) 2019, MariaDB Corporation.
 /** @file ha_clustrixdb.cc */
 
 #include "ha_clustrixdb.h"
+#include "ha_clustrixdb_pushdown.h"
 #include "key.h"
 
 handlerton *clustrixdb_hton = NULL;
@@ -1016,8 +1017,6 @@ int clustrixdb_discover_table(handlerton *hton, THD *thd, TABLE_SHARE *share)
   return error_code;
 }
 
-#include "ha_clustrixdb_pushdown.cc"
-
 static int clustrixdb_init(void *p)
 {
   clustrixdb_hton = (handlerton *) p;

storage/clustrixdb/ha_clustrixdb.h

@@ -32,7 +32,6 @@ class ha_clustrixdb : public handler
   ulonglong clustrix_table_oid;
   rpl_group_info *rgi;
   Relay_log_info *rli;
-  RPL_TABLE_LIST *rpl_table_list;
 
   Field *auto_inc_field;
   ulonglong auto_inc_value;
@@ -108,4 +107,6 @@ class ha_clustrixdb : public handler
                             size_t *packed_key_len);
 };
 
+bool select_handler_setting(THD* thd);
+bool derived_handler_setting(THD* thd);
 #endif  // _ha_clustrixdb_h

storage/clustrixdb/ha_clustrixdb_pushdown.cc

@@ -2,8 +2,11 @@
 Copyright (c) 2019, MariaDB Corporation.
 *****************************************************************************/
 
+#include "ha_clustrixdb.h"
 #include "ha_clustrixdb_pushdown.h"
 
+extern handlerton *clustrixdb_hton;
+
 /*@brief  Fills up array data types, metadata and nullability*/
 /************************************************************
  * DESCRIPTION:
@@ -85,7 +88,7 @@ int get_field_types(THD *thd, SELECT_LEX *sl, uchar *fieldtype,
  *  select_handler if possible
  *  NULL otherwise
  ************************************************************/
-static select_handler*
+select_handler*
 create_clustrixdb_select_handler(THD* thd, SELECT_LEX* select_lex)
 {
   ha_clustrixdb_select_handler *sh = NULL;
@@ -266,7 +269,7 @@ int ha_clustrixdb_select_handler::end_scan()
  *  derived_handler if possible
  *  NULL otherwise
  ************************************************************/
-static derived_handler*
+derived_handler*
 create_clustrixdb_derived_handler(THD* thd, TABLE_LIST *derived)
 {
   ha_clustrixdb_derived_handler *dh = NULL;

storage/clustrixdb/ha_clustrixdb_pushdown.h

@@ -29,7 +29,6 @@ class ha_clustrixdb_base_handler
     // Structures to unpack RBR rows from CLX BE
     rpl_group_info *rgi;
     Relay_log_info *rli;
-    RPL_TABLE_LIST *rpl_table_list;
     // CLX BE scan operation reference
     ulonglong scan_refid;
     // To unpack rows from CLX BE
@@ -84,5 +83,9 @@ class ha_clustrixdb_derived_handler:
 };
 
 
+select_handler *create_clustrixdb_select_handler(THD* thd,
+                                                 SELECT_LEX* select_lex);
+derived_handler *create_clustrixdb_derived_handler(THD* thd,
+                                                   TABLE_LIST *derived);
 
 #endif