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

MCOL-4124 return error when COMMIT|ROLLBACK error

Browse Source
This commit is contained in:
David Hall
2020-06-29 11:21:02 -05:00
parent 960c07a647
commit 4dddaa0274
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbcon/mysql/ha_mcs_dml.cpp
View File

@ -549,22 +549,18 @@ int ha_mcs_impl_write_last_batch(TABLE* table, cal_connection_info& ci, bool abo
{ {
ci.rowsHaveInserted += size; ci.rowsHaveInserted += size;
command = "COMMIT"; command = "COMMIT";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
else if (useHdfs) else if (useHdfs)
{ {
ci.rowsHaveInserted += size; ci.rowsHaveInserted += size;
command = "COMMIT"; command = "COMMIT";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
else if (( rc != 0) || abort ) else if (( rc != 0) || abort )
{ {
command = "ROLLBACK"; command = "ROLLBACK";
ProcessCommandStatement ( thd, command, ci, schema ); rc =ProcessCommandStatement ( thd, command, ci, schema );
}
else
{
return rc;
} }
return rc; return rc;
@ -630,7 +626,7 @@ int ha_mcs_impl_write_row_(const uchar* buf, TABLE* table, cal_connection_info&
if ( thd->killed > 0 ) if ( thd->killed > 0 )
{ {
command = "ROLLBACK"; command = "ROLLBACK";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
else if (rc != dmlpackageprocessor::DMLPackageProcessor::ACTIVE_TRANSACTION_ERROR) else if (rc != dmlpackageprocessor::DMLPackageProcessor::ACTIVE_TRANSACTION_ERROR)
{ {
@ -638,17 +634,17 @@ int ha_mcs_impl_write_row_(const uchar* buf, TABLE* table, cal_connection_info&
if ( rc != 0 ) if ( rc != 0 )
{ {
command = "ROLLBACK"; command = "ROLLBACK";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
else if (( rc == 0 ) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) else if (( rc == 0 ) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))
{ {
command = "COMMIT"; command = "COMMIT";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
else if (useHdfs) else if (useHdfs)
{ {
command = "COMMIT"; command = "COMMIT";
ProcessCommandStatement ( thd, command, ci, schema ); rc = ProcessCommandStatement ( thd, command, ci, schema );
} }
} }
} }