diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-08 10:36:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-08 10:36:41 +0300 |
| commit | ccc06931c3c7be094f6dcddeb45589f06cf0c8af (patch) | |
| tree | acfd8ed3cae2ee65cf6ddca6d96b907ea172d1dd /sql/unireg.cc | |
| parent | 9075973dbf2ef69e95d427e3a979be23435692e3 (diff) | |
| parent | 476966b3fb05ce8c061a4b77a0ab0b722bb0d192 (diff) | |
| download | mariadb-git-ccc06931c3c7be094f6dcddeb45589f06cf0c8af.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 79403ff339d..6860d2c6347 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -57,6 +57,13 @@ static bool make_empty_rec(THD *, uchar *, uint, List<Create_field> &, uint, */ static uchar *extra2_write_len(uchar *pos, size_t len) { + /* TODO: should be + if (len > 0 && len <= 255) + *pos++= (uchar)len; + ... + because extra2_read_len() uses 0 for 2-byte lengths. + extra2_str_size() must be fixed too. + */ if (len <= 255) *pos++= (uchar)len; else |