diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 21:18:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 21:18:15 +0300 |
| commit | 2bf93a8fd6d8d7563edc248183ca8b54a5d76dff (patch) | |
| tree | aeee1a3aeb5196092975248cb4e60760d9c40f4f /sql/sql_binlog.cc | |
| parent | 6b5f7ddc78e5e4796031fba27583d9b20504d529 (diff) | |
| parent | 294ac1fbab306e97dad3588a00e3527f2056e7e4 (diff) | |
| download | mariadb-git-2bf93a8fd6d8d7563edc248183ca8b54a5d76dff.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 44a885bf0eb..f1326d97a21 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -158,8 +158,9 @@ int binlog_defragment(THD *thd) memcpy(const_cast<char*>(thd->lex->comment.str) + gathered_length, entry[k]->value, entry[k]->length); gathered_length += entry[k]->length; - update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0); } + for (uint k=0; k < 2; k++) + update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0); DBUG_ASSERT(gathered_length == thd->lex->comment.length); |