diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
| commit | c7a2fb1e086f9eaf03fe437326ecf32329b22e37 (patch) | |
| tree | b2c78e5f3ece211a308ee65779d400e655a8b469 /sql/field.cc | |
| parent | 9d479e2577aa0d8df3f26cb7a779c9478e423583 (diff) | |
| parent | 4612cb88fa8b391812db44327040a5878e5dbc44 (diff) | |
| download | mariadb-git-c7a2fb1e086f9eaf03fe437326ecf32329b22e37.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index a7cfca6d819..2986442ad5e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3457,10 +3457,9 @@ int Field_new_decimal::cmp(const uchar *a,const uchar*b) } -void Field_new_decimal::sort_string(uchar *buff, - uint) +void Field_new_decimal::sort_string(uchar *buff, uint length) { - memcpy(buff, ptr, bin_size); + memcpy(buff, ptr, length); } |