diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
| commit | 5ece2155cba93a9a57e37d0c4ec624145cf8d4cf (patch) | |
| tree | cec927b268e9ac53767573ce21d53b811a9662ce /sql/sql_binlog.cc | |
| parent | db6e5bd9aaec7239d7c62820849a61b1059e4ad9 (diff) | |
| parent | b8e694a314b538b8bebec03a78b6df6570bd608b (diff) | |
| download | mariadb-git-5ece2155cba93a9a57e37d0c4ec624145cf8d4cf.tar.gz | |
Merge 10.4 into 10.5
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 ea91f68f360..4895eebdeb2 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); |