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 HA_ERR_INTERNAL_ERROR to ER_INTERNAL_ERROR to match MariaDB

Browse Source 
Remove nightly queries from the code base
This commit is contained in:
David Hall
2016-02-13 14:51:34 -06:00
parent ae64763fbd
commit 3b730e08f8
9846 changed files with 37 additions and 13917628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -1165,7 +1165,7 @@ uint32_t doUpdateDelete(THD *thd)
else
{
string emsg("Deleting rows from multiple tables in a single statement is currently not supported.");
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
ci->rc = 1;
thd->set_row_count_func(0);
return 0;
@ -1224,7 +1224,7 @@ uint32_t doUpdateDelete(THD *thd)
if (/*( select_lex.explicit_limit ) || */( select_lex.order_list.elements != 0 ) )
{
string emsg("DML Statement with order by clause is not currently supported.");
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
ci->rc = 1;
thd->set_row_count_func(0);
return 0;
@ -1317,7 +1317,7 @@ uint32_t doUpdateDelete(THD *thd)
//error out for now. Wait for scalar join.
/* Message::Args args;
string emsg(IDBErrorInfo::instance()->errorMsg(ERR_COLUMN_EQ_DIFFTABLE_COLUMN, args));
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
ci->rc = 1;
thd->set_row_count_func(0);
return 0;
@ -1661,7 +1661,7 @@ uint32_t doUpdateDelete(THD *thd)
if ( ( b != 0 ) && (b != dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING))
{
//@Bug 2540. Set error status instead of warning
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, errorMsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, errorMsg.c_str());
ci->rc = b;
thd->set_row_count_func(0);
thd->get_stmt_da()->set_overwrite_status(true);