diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:26:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:41:32 +0200 |
| commit | 514b305dfb2839c619a623bbdae5f21cf0077672 (patch) | |
| tree | 2f9700f05ccf0ddc7e46a547d9a191404e8dbbd7 /sql/sql_analyse.cc | |
| parent | de51acd03730311505677eb7212756e7126183b3 (diff) | |
| parent | 117291db8b35ddb4cd8c89ee4d8de888160b7163 (diff) | |
| download | mariadb-git-514b305dfb2839c619a623bbdae5f21cf0077672.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c
was skipped. In Galera 4, the implementation would seem to require
changes to the streaming replication.
In the tests archive.rnd_pos main.profiling, disable_ps_protocol
for SHOW STATUS and SHOW PROFILE commands until MDEV-18974
has been fixed.
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 a7cfaca0d0e..fa24ea142b1 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -295,9 +295,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; } @@ -1233,4 +1233,3 @@ uint check_ulonglong(const char *str, uint length) while (*cmp && *cmp++ == *str++) ; return ((uchar) str[-1] <= (uchar) cmp[-1]) ? smaller : bigger; } /* check_ulonlong */ - |