database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-3654: Fix row-based repl detection

Browse Source 
if 0'd the row-based repl checks for now to prevent ruling out
stmts we should be able to process.
This commit is contained in:
Patrick LeBlanc
2019-12-17 13:26:18 -05:00
parent e02302908b
commit d8e763655c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_mcs_impl.cpp
View File

@ -1265,8 +1265,10 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi)
if (((thd->lex)->sql_command == SQLCOM_UPDATE) || ((thd->lex)->sql_command == SQLCOM_UPDATE_MULTI)) if (((thd->lex)->sql_command == SQLCOM_UPDATE) || ((thd->lex)->sql_command == SQLCOM_UPDATE_MULTI))
args.add("Update"); args.add("Update");
#if 0
else if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0) else if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0)
args.add("Row based replication event"); args.add("Row based replication event");
#endif
else else
args.add("Delete"); args.add("Delete");
@ -1570,12 +1572,14 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi)
} }
} }
} }
#if 0
else if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0) else if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0)
{ {
string emsg = logging::IDBErrorInfo::instance()->errorMsg(ERR_RBR_EVENT); string emsg = logging::IDBErrorInfo::instance()->errorMsg(ERR_RBR_EVENT);
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, emsg); setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, emsg);
return ER_CHECK_NOT_IMPLEMENTED; return ER_CHECK_NOT_IMPLEMENTED;
} }
#endif
else else
{ {
updateCP->queryType(CalpontSelectExecutionPlan::DELETE); updateCP->queryType(CalpontSelectExecutionPlan::DELETE);
@ -2349,12 +2353,14 @@ int ha_mcs_impl_rnd_init(TABLE* table)
thd->lex->sql_command == SQLCOM_LOAD)) thd->lex->sql_command == SQLCOM_LOAD))
return 0; return 0;
#if 0
if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0) if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0)
{ {
string emsg = logging::IDBErrorInfo::instance()->errorMsg(ERR_RBR_EVENT); string emsg = logging::IDBErrorInfo::instance()->errorMsg(ERR_RBR_EVENT);
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, emsg); setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, emsg);
return ER_CHECK_NOT_IMPLEMENTED; return ER_CHECK_NOT_IMPLEMENTED;
} }
#endif
if ( (thd->lex)->sql_command == SQLCOM_ALTER_TABLE ) if ( (thd->lex)->sql_command == SQLCOM_ALTER_TABLE )
return 0; return 0;