diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 17:05:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 17:05:05 +0300 |
| commit | 79ed33c184e6e2a7d3796a16e29bbe7417610366 (patch) | |
| tree | 7e8c3e6d8405f3755769aceec078ee32c3bb72a8 /sql/sql_binlog.cc | |
| parent | 2e9f4cdc44cc560860b2b6c2a34a172df3dc9d49 (diff) | |
| parent | a8f044e1a42fedc7ad1c5532873af3d812c0b493 (diff) | |
| download | mariadb-git-79ed33c184e6e2a7d3796a16e29bbe7417610366.tar.gz | |
Merge 10.2 into 10.3
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 368fbb0df10..1b8ba311a80 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); |