diff options
| author | Monty <monty@mariadb.org> | 2020-06-28 20:07:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-02 17:57:34 +0300 |
| commit | 65f831d17c84900c1faea49164688e2f5ce59563 (patch) | |
| tree | c7c576c77fbee59de6b2a1c7d8ac5041e0e06f8d /sql/unireg.cc | |
| parent | 29f9e679adc90adf5d3c6e08da947789c9c2ac8b (diff) | |
| download | mariadb-git-65f831d17c84900c1faea49164688e2f5ce59563.tar.gz | |
Fixed bugs found by valgrind
- Some of the bug fixes are backports from 10.5!
- The fix in innobase/fil/fil0fil.cc is just a backport to get less
error messages in mysqld.1.err when running with valgrind.
- Renamed HAVE_valgrind_or_MSAN to HAVE_valgrind
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index b7eb1cd3457..cccb09a9fb9 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -436,8 +436,8 @@ LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING *table, pos+= create_info->comment.length; } - memcpy(frm_ptr + filepos, forminfo, 288); - pos= frm_ptr + filepos + 288; + memcpy(frm_ptr + filepos, forminfo, FRM_FORMINFO_SIZE); + pos= frm_ptr + filepos + FRM_FORMINFO_SIZE; if (pack_fields(&pos, create_fields, create_info, data_offset)) goto err; |