diff --git a/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp index 5f42d6d69..55532921a 100755 --- a/dbcon/mysql/ha_calpont.cpp +++ b/dbcon/mysql/ha_calpont.cpp @@ -213,8 +213,8 @@ static int calpont_init_func(void *p) calpont_hton->state= SHOW_OPTION_YES; calpont_hton->create= calpont_create_handler; calpont_hton->flags= HTON_CAN_RECREATE; - calpont_hton->discover_table= calpont_discover; - calpont_hton->discover_table_existence= calpont_discover_existence; +// calpont_hton->discover_table= calpont_discover; +// calpont_hton->discover_table_existence= calpont_discover_existence; calpont_hton->commit= calpont_commit; calpont_hton->rollback= calpont_rollback; calpont_hton->close_connection = calpont_close_connection; @@ -470,7 +470,7 @@ int ha_calpont::write_row(uchar *buf) 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"); 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"); 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); } diff --git a/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h index 0976a4285..0b1c9dd8a 100755 --- a/dbcon/mysql/ha_calpont.h +++ b/dbcon/mysql/ha_calpont.h @@ -187,7 +187,7 @@ public: We implement this in ha_example.cc. It's not an obligatory method; 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 We implement this in ha_example.cc. It's not an obligatory method; diff --git a/dbcon/mysql/mysql.vpj b/dbcon/mysql/mysql.vpj index 9b5fe8d7e..307aef375 100644 --- a/dbcon/mysql/mysql.vpj +++ b/dbcon/mysql/mysql.vpj @@ -244,6 +244,7 @@ +