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

MariaDB 10.1 has different signature for start_bulk_insert than mysql 5.1.73

Browse Source
This commit is contained in:
David Hall
2016-02-19 12:11:05 -06:00
parent f458cb46cc
commit d24629b467
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_calpont.cpp
View File

@ -213,8 +213,8 @@ static int calpont_init_func(void *p)
calpont_hton->state= SHOW_OPTION_YES; calpont_hton->state= SHOW_OPTION_YES;
calpont_hton->create= calpont_create_handler; calpont_hton->create= calpont_create_handler;
calpont_hton->flags= HTON_CAN_RECREATE; calpont_hton->flags= HTON_CAN_RECREATE;
calpont_hton->discover_table= calpont_discover; // calpont_hton->discover_table= calpont_discover;
calpont_hton->discover_table_existence= calpont_discover_existence; // calpont_hton->discover_table_existence= calpont_discover_existence;
calpont_hton->commit= calpont_commit; calpont_hton->commit= calpont_commit;
calpont_hton->rollback= calpont_rollback; calpont_hton->rollback= calpont_rollback;
calpont_hton->close_connection = calpont_close_connection; calpont_hton->close_connection = calpont_close_connection;
@ -470,7 +470,7 @@ int ha_calpont::write_row(uchar *buf)
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }
void ha_calpont::start_bulk_insert(ha_rows rows) void ha_calpont::start_bulk_insert(ha_rows rows, uint flags)
{ {
DBUG_ENTER("ha_calpont::start_bulk_insert"); DBUG_ENTER("ha_calpont::start_bulk_insert");
ha_calpont_impl_start_bulk_insert(rows, table); ha_calpont_impl_start_bulk_insert(rows, table);
@ -1028,7 +1028,7 @@ int ha_calpont::create(const char *name, TABLE *table_arg,
DBUG_ENTER("ha_calpont::create"); DBUG_ENTER("ha_calpont::create");
int rc = ha_calpont_impl_create(name, table_arg, create_info); int rc = ha_calpont_impl_create(name, table_arg, create_info);
table_arg->s->write_frm_image(); // table_arg->s->write_frm_image();
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }

2
dbcon/mysql/ha_calpont.h
View File

@ -187,7 +187,7 @@ public:
We implement this in ha_example.cc. It's not an obligatory method; We implement this in ha_example.cc. It's not an obligatory method;
skip it and and MySQL will treat it as not implemented. skip it and and MySQL will treat it as not implemented.
*/ */
void start_bulk_insert(ha_rows rows) ; void start_bulk_insert(ha_rows rows, uint flags= 0) ;
/** @brief /** @brief
We implement this in ha_example.cc. It's not an obligatory method; We implement this in ha_example.cc. It's not an obligatory method;

1
dbcon/mysql/mysql.vpj
View File

@ -244,6 +244,7 @@
<F N="../../../mariadb/sql/gcalc_tools.h"/> <F N="../../../mariadb/sql/gcalc_tools.h"/>
<F N="../../../mariadb/sql/group_by_handler.h"/> <F N="../../../mariadb/sql/group_by_handler.h"/>
<F N="../../../mariadb/sql/gstream.h"/> <F N="../../../mariadb/sql/gstream.h"/>
<F N="ha_calpont.h"/>
<F N="../../../mariadb/sql/ha_partition.h"/> <F N="../../../mariadb/sql/ha_partition.h"/>
<F N="../../../mariadb/sql/handler.h"/> <F N="../../../mariadb/sql/handler.h"/>
<F N="../../../mariadb/sql/hash_filo.h"/> <F N="../../../mariadb/sql/hash_filo.h"/>