diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
| commit | 1bf3e8ab43e982953d7534db902020d321364afb (patch) | |
| tree | 7de4aaac9f947d4302cd4edbb5677da8917ade71 /sql/filesort.cc | |
| parent | f5bebaf1d6a0ff2fca9b342ed5910b9d34a276bb (diff) | |
| parent | 4901f31c13f91e130f077f2f77b32c40b0036e32 (diff) | |
| download | mariadb-git-1bf3e8ab43e982953d7534db902020d321364afb.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 1855430b944..6901cee043f 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1004,7 +1004,9 @@ Type_handler_string_result::make_sort_key(uchar *to, Item *item, if (use_strnxfrm(cs)) { - IF_DBUG(size_t tmp_length= ,) +#ifdef DBUG_ASSERT_EXISTS + size_t tmp_length= +#endif cs->coll->strnxfrm(cs, to, sort_field->length, item->max_char_length() * cs->strxfrm_multiply, |