diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/unireg.cc | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 05a4fbb1..104d7e20 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -802,7 +802,7 @@ static bool pack_vcols(THD *thd, String *buf, List<Create_field> &create_fields, { if (field->vcol_info && field->vcol_info->expr) if (pack_expression(buf, field->vcol_info, field_nr, - field->vcol_info->stored_in_db + field->vcol_info->is_stored() ? VCOL_GENERATED_STORED : VCOL_GENERATED_VIRTUAL)) return 1; if (field->has_default_expression() && !field->has_default_now_unireg_check()) @@ -930,7 +930,7 @@ static bool pack_header(THD *thd, uchar *forminfo, hex_length= length * 2; tmpint->type_lengths[pos]= (uint) hex_length; tmpint->type_names[pos]= dst= (char*) thd->alloc(hex_length + 1); - octet2hex(dst, src, length); + octet2hex(dst, (uchar*)src, length); } } |