database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #822 from mariadb-corporation/remove-infinidb

Browse Source 
Fix hton usage
This commit is contained in:
Roman Nozdrin
2019-08-14 16:44:13 +03:00
committed by GitHub
parent 0879d70d87 ad355dc771
commit f64db01d81
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/ha_calpont.cpp
View File

@ -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_rollback(handlerton* hton, THD* thd, bool all);
static int calpont_close_connection ( handlerton* hton, THD* thd ); static int calpont_close_connection ( handlerton* hton, THD* thd );
handlerton* calpont_hton;
handlerton* mcs_hton; handlerton* mcs_hton;
// handlers creation function for 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 //@Bug 2526 Only register the transaction when autocommit is off
if ((thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) 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); int rc = ha_calpont_impl_external_lock(thd, table, lock_type);
DBUG_RETURN(rc); DBUG_RETURN(rc);

1
dbcon/mysql/ha_calpont.h
View File

@ -21,7 +21,6 @@
#include "idb_mysql.h" #include "idb_mysql.h"
#include "ha_mcs_sysvars.h" #include "ha_mcs_sysvars.h"
extern handlerton* calpont_hton;
extern handlerton* mcs_hton; extern handlerton* mcs_hton;
/** @brief /** @brief

6
dbcon/mysql/ha_mcs_pushdown.cpp
View File

@ -284,7 +284,7 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
***********************************************************/ ***********************************************************/
ha_columnstore_derived_handler::ha_columnstore_derived_handler(THD *thd, ha_columnstore_derived_handler::ha_columnstore_derived_handler(THD *thd,
TABLE_LIST *dt) TABLE_LIST *dt)
: derived_handler(thd, calpont_hton) : derived_handler(thd, mcs_hton)
{ {
derived = dt; derived = dt;
} }
@ -373,7 +373,7 @@ void ha_columnstore_derived_handler::print_error(int, unsigned long)
* query - Query describing structure * query - Query describing structure
***********************************************************/ ***********************************************************/
ha_calpont_group_by_handler::ha_calpont_group_by_handler(THD* thd_arg, Query* query) 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), select(query->select),
table_list(query->from), table_list(query->from),
distinct(query->distinct), 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, ha_columnstore_select_handler::ha_columnstore_select_handler(THD *thd,
SELECT_LEX* select_lex) SELECT_LEX* select_lex)
: select_handler(thd, calpont_hton) : select_handler(thd, mcs_hton)
{ {
select = select_lex; select = select_lex;
} }