diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 10:42:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 10:42:59 +0300 |
| commit | a84060567c1b9c3f1efd94fabc99a40b3f91b598 (patch) | |
| tree | 922fcf9d1388c04de5df4ea1aad17970fa6f3a64 /sql/sql_binlog.cc | |
| parent | c93f8aca656b897d0d5ce6d94196662a4161ad38 (diff) | |
| parent | 44c8d84908e9d697bbcea55d6ebcd5f2250c4727 (diff) | |
| download | mariadb-git-a84060567c1b9c3f1efd94fabc99a40b3f91b598.tar.gz | |
Merge 10.1 into 10.2
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 5bc4c179721..59d7e9cb028 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -158,8 +158,9 @@ int binlog_defragment(THD *thd) memcpy(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); |