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

14
dbcon/mysql/ha_calpont_ddl.cpp
View File

@ -1799,7 +1799,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DDLProc");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DDLProc");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
}
@ -1815,7 +1815,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
rc =1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DDLProc");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DDLProc");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
}
@ -1824,7 +1824,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Unknown error caught");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Unknown error caught");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
}
@ -1833,7 +1833,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
}
if (b ==ddlpackageprocessor::DDLPackageProcessor::WARNING)
@ -1949,7 +1949,7 @@ int ha_calpont_impl_create_(const char *name, TABLE *table_arg, HA_CREATE_INFO *
&& tbl != "sysconstraintcol" )
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Can not create non-system Calpont tables in calpontsys database");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Can not create non-system Calpont tables in calpontsys database");
return 1;
}
@ -1979,13 +1979,13 @@ int ha_calpont_impl_create_(const char *name, TABLE *table_arg, HA_CREATE_INFO *
if (db == "calpontsys")
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Calpont system tables can only be created with 'SCHEMA SYNC ONLY'");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Calpont system tables can only be created with 'SCHEMA SYNC ONLY'");
return 1;
}
else if ( db == "infinidb_vtable") //@bug 3540. table created in infinidb_vtable schema could be dropped when select statement happen to have same tablename.
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Table creation is not allowed in infinidb_vtable schema.");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Table creation is not allowed in infinidb_vtable schema.");
return 1;
}
}

32
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -282,7 +282,7 @@ int ProcessCommandStatement(THD *thd, string& dmlStatement, cal_connection_info&
thd->killed = KILL_QUERY;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [1]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [1]");
}
else {
bytestream >> b;
@ -296,7 +296,7 @@ int ProcessCommandStatement(THD *thd, string& dmlStatement, cal_connection_info&
thd->killed = KILL_QUERY;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [2]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [2]");
}
catch (...)
{
@ -304,14 +304,14 @@ int ProcessCommandStatement(THD *thd, string& dmlStatement, cal_connection_info&
thd->killed = KILL_QUERY;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Caught unknown error");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Caught unknown error");
}
if (( b !=0 ) && (!thd->get_stmt_da()->is_set()))
{
rc = 1;
thd->killed = KILL_QUERY;
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, errormsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, errormsg.c_str());
}
delete ci.dmlProc;
ci.dmlProc = NULL;
@ -338,7 +338,7 @@ int doProcessInsertValues ( TABLE* table, uint32_t size, cal_connection_info& ci
rc = -1;
string emsg("Calpont DML package cannot build. ");
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
return rc;
}
@ -503,7 +503,7 @@ int doProcessInsertValues ( TABLE* table, uint32_t size, cal_connection_info& ci
if ((b != 0) && (b != dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING))
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, errormsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, errormsg.c_str());
}
if ( b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING )
@ -567,7 +567,7 @@ int ha_calpont_impl_write_last_batch(TABLE* table, cal_connection_info& ci, bool
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
std::string errormsg = "statement is aborted.";
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, errormsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, errormsg.c_str());
}
if ( rc == dmlpackageprocessor::DMLPackageProcessor::ACTIVE_TRANSACTION_ERROR )
@ -619,7 +619,7 @@ int ha_calpont_impl_write_row_(uchar *buf, TABLE* table, cal_connection_info& ci
rc = 1;
ci.rc = rc; //@Bug 2790 Save the error infomation.
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, rex.what());
thd->raise_error_printf(ER_INTERNAL_ERROR, rex.what());
return rc;
}
//timer.stop( "buildValueList");
@ -1581,7 +1581,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
if ( bytestream.length() == 0 )
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [5]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [5]");
}
else
{
@ -1595,12 +1595,12 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
catch (runtime_error&)
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [6]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [6]");
}
catch (...)
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Caught unknown error");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Caught unknown error");
}
if ( b != 0 )
tableLockInfo = errorMsg;
@ -1653,7 +1653,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
eMsg += prelimTask;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, eMsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, eMsg.c_str());
return tableLockInfo;
}
catch (...)
@ -1662,7 +1662,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
eMsg += prelimTask;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, eMsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, eMsg.c_str());
return tableLockInfo;
}
@ -1694,7 +1694,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
if ( bytestream.length() == 0 )
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [7]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [7]");
}
else
{
@ -1708,12 +1708,12 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
catch (runtime_error&)
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DMLProc [8]");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DMLProc [8]");
}
catch (...)
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Caught unknown error");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Caught unknown error");
}
//@Bug 2606. Send error message back to sql session
if ( b != 0 )

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);

18
dbcon/mysql/ha_calpont_partition.cpp
View File

@ -482,7 +482,7 @@ int processPartition ( SqlStatement* stmt)
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DDLProc");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DDLProc");
}
else
{
@ -495,13 +495,13 @@ int processPartition ( SqlStatement* stmt)
{
rc =1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Lost connection to DDLProc");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Lost connection to DDLProc");
}
catch (...)
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, "Unknown error caught");
thd->raise_error_printf(ER_INTERNAL_ERROR, "Unknown error caught");
}
if (b == ddlpackageprocessor::DDLPackageProcessor::WARN_NO_PARTITION)
@ -523,7 +523,7 @@ int processPartition ( SqlStatement* stmt)
else if (b != 0 && b != ddlpackageprocessor::DDLPackageProcessor::WARN_NO_PARTITION)
{
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, emsg.c_str());
thd->raise_error_printf(ER_INTERNAL_ERROR, emsg.c_str());
}
return rc;
}
@ -1195,7 +1195,7 @@ const char* calenablepartitions(UDF_INIT* initid, UDF_ARGS* args,
if (!current_thd->db)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, IDBErrorInfo::instance()->errorMsg(ERR_PARTITION_NO_SCHEMA).c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, IDBErrorInfo::instance()->errorMsg(ERR_PARTITION_NO_SCHEMA).c_str());
return result;
}
tableName.schema = current_thd->db;
@ -1279,7 +1279,7 @@ const char* caldroppartitions(UDF_INIT* initid, UDF_ARGS* args,
if (!current_thd->db)
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, IDBErrorInfo::instance()->errorMsg(ERR_PARTITION_NO_SCHEMA).c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, IDBErrorInfo::instance()->errorMsg(ERR_PARTITION_NO_SCHEMA).c_str());
return result;
}
tableName.schema = current_thd->db;
@ -1365,7 +1365,7 @@ const char* caldroppartitionsbyvalue(UDF_INIT* initid, UDF_ARGS* args,
if (!msg.empty())
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, msg.c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, msg.c_str());
return result;
}
@ -1436,7 +1436,7 @@ const char* caldisablepartitionsbyvalue(UDF_INIT* initid, UDF_ARGS* args,
if (!msg.empty())
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, msg.c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, msg.c_str());
return result;
}
@ -1507,7 +1507,7 @@ const char* calenablepartitionsbyvalue(UDF_INIT* initid, UDF_ARGS* args,
if (!msg.empty())
{
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, msg.c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, msg.c_str());
return result;
}

2
dbcon/mysql/ha_pseudocolumn.cpp
View File

@ -45,7 +45,7 @@ void bailout(char* error, const string& funcName)
{
string errMsg = IDBErrorInfo::instance()->errorMsg(ERR_PSEUDOCOL_IDB_ONLY, funcName);
current_thd->get_stmt_da()->set_overwrite_status(true);
current_thd->raise_error_printf(HA_ERR_INTERNAL_ERROR, errMsg.c_str());
current_thd->raise_error_printf(ER_INTERNAL_ERROR, errMsg.c_str());
*error = 1;
}