diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
| commit | b64fde8f38515dc39e019de26db7624cc0ea7046 (patch) | |
| tree | 0478ea4c3ddeee290f6d381a47efa4f9aded9c0b /sql/sql_analyse.cc | |
| parent | a89ee3cd154a67df2231f034fd8339f9225dbe64 (diff) | |
| parent | 1f020299f816263e347c852eb2a494b5ef1cbf0d (diff) | |
| download | mariadb-git-b64fde8f38515dc39e019de26db7624cc0ea7046.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 6626a054052..48e61177774 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -298,9 +298,9 @@ bool get_ev_num_info(EV_NUM_INFO *ev_info, NUM_INFO *info, const char *num) } // get_ev_num_info -int free_string(String *s) +int free_string(void* str, TREE_FREE, void*) { - s->free(); + ((String*)str)->free(); return 0; } @@ -1242,4 +1242,3 @@ uint check_ulonglong(const char *str, uint length) while (*cmp && *cmp++ == *str++) ; return ((uchar) str[-1] <= (uchar) cmp[-1]) ? smaller : bigger; } /* check_ulonlong */ - |