diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 23:31:12 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 23:31:12 +0300 |
| commit | 0fd89a1a89da73cec8e87e1f007637eaec51dcc0 (patch) | |
| tree | 2198830733091087ae4d342d56c93540698ec325 /sql/field.cc | |
| parent | 70684afef2ce6d797f78db192c4472260cd22660 (diff) | |
| parent | e9f06b19e09319d11c346943871254aaf755af24 (diff) | |
| download | mariadb-git-0fd89a1a89da73cec8e87e1f007637eaec51dcc0.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 9b6f117a82e..e73cc380196 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7698,7 +7698,7 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value) } -#ifdef HAVE_valgrind_or_MSAN +#ifdef HAVE_valgrind void Field_varstring::mark_unused_memory_as_defined() { uint used_length= get_length(); |