diff options
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index ddb1163d56a..5de72c55040 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -5028,21 +5028,20 @@ public: DBUG_VOID_RETURN; } - Incident_log_event(THD *thd_arg, Incident incident, LEX_STRING const msg) + Incident_log_event(THD *thd_arg, Incident incident, const LEX_CSTRING *msg) : Log_event(thd_arg, 0, FALSE), m_incident(incident) { DBUG_ENTER("Incident_log_event::Incident_log_event"); DBUG_PRINT("enter", ("m_incident: %d", m_incident)); - m_message.str= NULL; m_message.length= 0; - if (!(m_message.str= (char*) my_malloc(msg.length+1, MYF(MY_WME)))) + if (!(m_message.str= (char*) my_malloc(msg->length+1, MYF(MY_WME)))) { /* Mark this event invalid */ m_incident= INCIDENT_NONE; DBUG_VOID_RETURN; } - strmake(m_message.str, msg.str, msg.length); - m_message.length= msg.length; + strmake(m_message.str, msg->str, msg->length); + m_message.length= msg->length; set_direct_logging(); /* Replicate the incident irregardless of @@skip_replication. */ flags&= ~LOG_EVENT_SKIP_REPLICATION_F; |