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

12
dbcon/mysql/ha_calpont_partition.cpp
View File

@ -981,13 +981,13 @@ const char* calshowpartitions(UDF_INIT* initid, UDF_ARGS* args,
} catch (IDBExcept& ex)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, ex.what());
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, ex.what());
return result;
}
catch (...)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, "Error occured when calling CALSHOWPARTITIONS");
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Error occured when calling CALSHOWPARTITIONS");
return result;
}
@ -1749,19 +1749,19 @@ const char* calshowpartitionsbyvalue(UDF_INIT* initid, UDF_ARGS* args,
args.add(ex.what());
errMsg = IDBErrorInfo::instance()->errorMsg(ERR_INVALID_FUNC_ARGUMENT, args);
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, (char*)errMsg.c_str());
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, (char*)errMsg.c_str());
return result;
}
catch (IDBExcept& ex)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, ex.what());
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, ex.what());
return result;
}
catch (...)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, "Error occured when calling CALSHOWPARTITIONS");
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Error occured when calling CALSHOWPARTITIONS");
return result;
}
@ -1826,7 +1826,7 @@ const char* calshowpartitionsbyvalue(UDF_INIT* initid, UDF_ARGS* args,
{
errMsg = IDBErrorInfo::instance()->errorMsg(WARN_NO_PARTITION_FOUND);
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_UNSUPPORTED, errMsg.c_str());
current_thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, errMsg.c_str());
return result;
}