diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-21 14:02:04 +0300 |
| commit | 620ea816adeceaba7c875679ab8505f4c07a22b8 (patch) | |
| tree | a52749e4f0c1fd07bc9f0c2a1159706a4e7789c3 /sql/log_event.cc | |
| parent | a1b6691f93e50ad4a8a53dbf89ba578d6a64b2cb (diff) | |
| parent | b4c225ac354686242b5336da84b7a758640936bd (diff) | |
| download | mariadb-git-620ea816adeceaba7c875679ab8505f4c07a22b8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5fd977da511..097cbe8da9d 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2037,7 +2037,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len, else DBUG_RETURN(NULL); #else - *error= ER(ER_BINLOG_READ_EVENT_CHECKSUM_FAILURE); + *error= ER_THD_OR_DEFAULT(current_thd, ER_BINLOG_READ_EVENT_CHECKSUM_FAILURE); sql_print_error("%s", *error); DBUG_RETURN(NULL); #endif |