diff --git a/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp
index 4b1a0365c..218aa124f 100644
--- a/dbcon/mysql/ha_calpont.cpp
+++ b/dbcon/mysql/ha_calpont.cpp
@@ -31,7 +31,6 @@ static int calpont_commit(handlerton* hton, THD* thd, bool all);
 
 static int calpont_rollback(handlerton* hton, THD* thd, bool all);
 static int calpont_close_connection ( handlerton* hton, THD* thd );
-handlerton* calpont_hton;
 handlerton* mcs_hton;
 
 // handlers creation function for hton.
@@ -733,7 +732,7 @@ int ha_calpont::external_lock(THD* thd, int lock_type)
 
     //@Bug 2526 Only register the transaction when autocommit is off
     if ((thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
-        trans_register_ha( thd, true, calpont_hton);
+        trans_register_ha( thd, true, mcs_hton);
 
     int rc = ha_calpont_impl_external_lock(thd, table, lock_type);
     DBUG_RETURN(rc);
diff --git a/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h
index 8e0c90407..3f84d1d95 100644
--- a/dbcon/mysql/ha_calpont.h
+++ b/dbcon/mysql/ha_calpont.h
@@ -21,7 +21,6 @@
 #include "idb_mysql.h"
 #include "ha_mcs_sysvars.h"
 
-extern handlerton* calpont_hton;
 extern handlerton* mcs_hton;
 
 /** @brief
diff --git a/dbcon/mysql/ha_mcs_pushdown.cpp b/dbcon/mysql/ha_mcs_pushdown.cpp
index ab8966290..713b70145 100644
--- a/dbcon/mysql/ha_mcs_pushdown.cpp
+++ b/dbcon/mysql/ha_mcs_pushdown.cpp
@@ -284,7 +284,7 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
  ***********************************************************/
 ha_columnstore_derived_handler::ha_columnstore_derived_handler(THD *thd,
                                                              TABLE_LIST *dt)
-  : derived_handler(thd, calpont_hton)
+  : derived_handler(thd, mcs_hton)
 {
   derived = dt;
 }
@@ -373,7 +373,7 @@ void ha_columnstore_derived_handler::print_error(int, unsigned long)
  *    query - Query describing structure
  ***********************************************************/
 ha_calpont_group_by_handler::ha_calpont_group_by_handler(THD* thd_arg, Query* query)
-        : group_by_handler(thd_arg, calpont_hton),
+        : group_by_handler(thd_arg, mcs_hton),
           select(query->select),
           table_list(query->from),
           distinct(query->distinct),
@@ -537,7 +537,7 @@ create_columnstore_select_handler(THD* thd, SELECT_LEX* select_lex)
  ***********************************************************/
 ha_columnstore_select_handler::ha_columnstore_select_handler(THD *thd,
                                                              SELECT_LEX* select_lex)
-  : select_handler(thd, calpont_hton)
+  : select_handler(thd, mcs_hton)
 {
   select = select_lex;
 }