diff options
author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2022-10-13 18:08:48 +0300 |
---|---|---|
committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2022-10-14 23:27:18 +0300 |
commit | 7f62e80b11a50fdf4e58abbba31d633fc2c07b12 (patch) | |
tree | e144ed402d351237ae8c02cb2f705e428a8b4709 | |
parent | ee067a8793dfe9b17c51f72331114249560886c0 (diff) | |
download | mariadb-git-bb-10.10-ddl-nikita.tar.gz |
few rgi assertions. this can proof that rgi is always presentbb-10.10-ddl-nikita
-rw-r--r-- | sql/log_event_server.cc | 3 | ||||
-rw-r--r-- | sql/rpl_record.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index f654b44102f..a5cf00ef4e3 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -5697,6 +5697,7 @@ inline void restore_empty_query_table_list(LEX *lex) int Rows_log_event::do_apply_event(rpl_group_info *rgi) { + DBUG_ASSERT(rgi); Relay_log_info const *rli= rgi->rli; TABLE* table; DBUG_ENTER("Rows_log_event::do_apply_event(Relay_log_info*)"); @@ -6009,7 +6010,7 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi) set_flags(COMPLETE_ROWS_F); Rpl_table_data rpl_data{}; - if (rgi) rgi->get_table_data(table, &rpl_data); + rgi->get_table_data(table, &rpl_data); m_online_alter= rpl_data.is_online_alter(); diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc index 53d0c91665a..719e21723d5 100644 --- a/sql/rpl_record.cc +++ b/sql/rpl_record.cc @@ -232,6 +232,7 @@ int unpack_row(const rpl_group_info *rgi, TABLE *table, uint const colcnt, table_found, tabledef, conv_table)); DBUG_ASSERT(table_found); + DBUG_ASSERT(rgi); /* If rgi is NULL it means that there is no source table and that the row shall just be unpacked without doing any checks. This feature |