summaryrefslogtreecommitdiff
path: root/sql/log_event_server.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/log_event_server.cc')
-rw-r--r--sql/log_event_server.cc74
1 files changed, 55 insertions, 19 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index 55ad50511ec..91e789cd639 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -7492,13 +7492,21 @@ Write_rows_log_event::do_exec_row(rpl_group_info *rgi)
{
DBUG_ASSERT(m_table != NULL);
const char *tmp= thd->get_proc_info();
- const char *message= "Write_rows_log_event::write_row()";
+ LEX_CSTRING tmp_db= thd->db;
+ char *message, msg[128];
+ const char *table_name= m_table->s->table_name.str;
+ char quote_char= get_quote_char_for_identifier(thd, STRING_WITH_LEN(table_name));
+ my_snprintf(msg, sizeof(msg),"Write_rows_log_event::write_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ thd->reset_db(&m_table->s->db);
+ message= msg;
int error;
#ifdef WSREP_PROC_INFO
my_snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Write_rows_log_event::write_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Write_rows_log_event::write_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name,
+ quote_char);
message= thd->wsrep_info;
#endif /* WSREP_PROC_INFO */
@@ -7512,6 +7520,7 @@ Write_rows_log_event::do_exec_row(rpl_group_info *rgi)
my_error(ER_UNKNOWN_ERROR, MYF(0));
}
+ thd->reset_db(&tmp_db);
return error;
}
@@ -8108,14 +8117,22 @@ int Delete_rows_log_event::do_exec_row(rpl_group_info *rgi)
{
int error;
const char *tmp= thd->get_proc_info();
- const char *message= "Delete_rows_log_event::find_row()";
+ LEX_CSTRING tmp_db= thd->db;
+ char *message, msg[128];
+ const char *table_name= m_table->s->table_name.str;
+ char quote_char= get_quote_char_for_identifier(thd, STRING_WITH_LEN(table_name));
+ my_snprintf(msg, sizeof(msg),"Delete_rows_log_event::find_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ thd->reset_db(&m_table->s->db);
+ message= msg;
const bool invoke_triggers= (m_table->triggers && do_invoke_trigger());
DBUG_ASSERT(m_table != NULL);
#ifdef WSREP_PROC_INFO
my_snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Delete_rows_log_event::find_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Delete_rows_log_event::find_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name,
+ quote_char);
message= thd->wsrep_info;
#endif /* WSREP_PROC_INFO */
@@ -8125,11 +8142,14 @@ int Delete_rows_log_event::do_exec_row(rpl_group_info *rgi)
/*
Delete the record found, located in record[0]
*/
- message= "Delete_rows_log_event::ha_delete_row()";
+ my_snprintf(msg, sizeof(msg),"Delete_rows_log_event::ha_delete_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ message= msg;
#ifdef WSREP_PROC_INFO
snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Delete_rows_log_event::ha_delete_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Delete_rows_log_event::ha_delete_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name,
+ quote_char);
message= thd->wsrep_info;
#endif
thd_proc_info(thd, message);
@@ -8160,6 +8180,7 @@ int Delete_rows_log_event::do_exec_row(rpl_group_info *rgi)
error= HA_ERR_GENERIC; // in case if error is not set yet
m_table->file->ha_index_or_rnd_end();
}
+ thd->reset_db(&tmp_db);
thd_proc_info(thd, tmp);
return error;
}
@@ -8259,13 +8280,21 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
{
const bool invoke_triggers= (m_table->triggers && do_invoke_trigger());
const char *tmp= thd->get_proc_info();
- const char *message= "Update_rows_log_event::find_row()";
DBUG_ASSERT(m_table != NULL);
+ LEX_CSTRING tmp_db= thd->db;
+ char *message, msg[128];
+ const char *table_name= m_table->s->table_name.str;
+ char quote_char= get_quote_char_for_identifier(thd, STRING_WITH_LEN(table_name));
+ my_snprintf(msg, sizeof(msg),"Update_rows_log_event::find_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ thd->reset_db(&m_table->s->db);
+ message= msg;
#ifdef WSREP_PROC_INFO
my_snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Update_rows_log_event::find_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Update_rows_log_event::find_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name,
+ quote_char);
message= thd->wsrep_info;
#endif /* WSREP_PROC_INFO */
@@ -8286,6 +8315,7 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
if ((m_curr_row= m_curr_row_end))
unpack_current_row(rgi, &m_cols_ai);
thd_proc_info(thd, tmp);
+ thd->reset_db(&tmp_db);
return error;
}
@@ -8303,11 +8333,14 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
store_record(m_table,record[1]);
m_curr_row= m_curr_row_end;
- message= "Update_rows_log_event::unpack_current_row()";
+ my_snprintf(msg, sizeof(msg),"Update_rows_log_event::unpack_current_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ message= msg;
#ifdef WSREP_PROC_INFO
my_snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Update_rows_log_event::unpack_current_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Update_rows_log_event::unpack_current_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name,
+ quote_char);
message= thd->wsrep_info;
#endif /* WSREP_PROC_INFO */
@@ -8330,11 +8363,13 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
DBUG_DUMP("new values", m_table->record[0], m_table->s->reclength);
#endif
- message= "Update_rows_log_event::ha_update_row()";
+ my_snprintf(msg, sizeof(msg),"Update_rows_log_event::ha_update_row() on table %c%s%c",
+ quote_char, table_name, quote_char);
+ message= msg;
#ifdef WSREP_PROC_INFO
my_snprintf(thd->wsrep_info, sizeof(thd->wsrep_info) - 1,
- "Update_rows_log_event::ha_update_row(%lld)",
- (long long) wsrep_thd_trx_seqno(thd));
+ "Update_rows_log_event::ha_update_row(%lld) on table %c%s%c",
+ (long long) wsrep_thd_trx_seqno(thd), quote_char, table_name, quote_char);
message= thd->wsrep_info;
#endif /* WSREP_PROC_INFO */
@@ -8363,9 +8398,10 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
unlikely(process_triggers(TRG_EVENT_UPDATE, TRG_ACTION_AFTER, TRUE)))
error= HA_ERR_GENERIC; // in case if error is not set yet
- thd_proc_info(thd, tmp);
err:
+ thd_proc_info(thd, tmp);
+ thd->reset_db(&tmp_db);
m_table->file->ha_index_or_rnd_end();
return error;
}
View Lorry Controller Status