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

Change error codes to match MariaDB's new scheme

Browse Source
This commit is contained in:
David Hall
2016-02-17 10:09:40 -06:00
parent d393d33c0d
commit 357cba722c
9 changed files with 292 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dbcon/mysql/ha_calpont.cpp
View File

@ -107,7 +107,6 @@
*/
#include "ha_calpont.h"
#include "versionnumber.h"
#define NEED_CALPONT_EXTERNS
@ -159,11 +158,32 @@ static uchar* calpont_get_key(INFINIDB_SHARE *share, size_t *length,
int calpont_discover(handlerton *hton, THD* thd, TABLE_SHARE *share)
{
DBUG_ENTER("calpont_discover");
DBUG_PRINT("calpont_discover", ("db: '%s' name: '%s'", share->db.str,
share->table_name.str));
#ifdef INFINIDB_DEBUG
fprintf(stderr, "calpont_discover()\n");
#endif
return 1;
uchar* frm_data = NULL;
size_t frm_len = 0;
int error = 0;
if (!ha_calpont_impl_discover_existence(share->db.str, share->table_name.str))
DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
error = share->read_frm_image((const uchar**)&frm_data, &frm_len);
if (error)
DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
my_errno= share->init_from_binary_frm_image(thd, 1, frm_data, frm_len);
my_free(frm_data);
DBUG_RETURN(my_errno);
}
int calpont_discover_existence(handlerton *hton, const char *db,
const char *table_name)
{
@ -195,7 +215,7 @@ 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= calpont_discover;
calpont_hton->discover_table_existence= calpont_discover_existence;
calpont_hton->commit= calpont_commit;
calpont_hton->rollback= calpont_rollback;
@ -1008,10 +1028,6 @@ int ha_calpont::create(const char *name, TABLE *table_arg,
HA_CREATE_INFO *create_info)
{
DBUG_ENTER("ha_calpont::create");
/*
This is not implemented but we want someone to be able to see that it
works.
*/
int rc = ha_calpont_impl_create(name, table_arg, create_info);