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/item_jsonfunc.cc | |
| parent | a89ee3cd154a67df2231f034fd8339f9225dbe64 (diff) | |
| parent | 1f020299f816263e347c852eb2a494b5ef1cbf0d (diff) | |
| download | mariadb-git-b64fde8f38515dc39e019de26db7624cc0ea7046.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index fe8784a7073..960a6e9ccc8 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -680,11 +680,11 @@ static int alloc_tmp_paths(THD *thd, uint n_paths, *paths= (json_path_with_flags *) alloc_root(root, sizeof(json_path_with_flags) * n_paths); - *tmp_paths= (String *) alloc_root(root, sizeof(String) * n_paths); + + *tmp_paths= new (root) String[n_paths]; if (*paths == 0 || *tmp_paths == 0) return 1; - bzero(*tmp_paths, sizeof(String) * n_paths); for (uint c_path=0; c_path < n_paths; c_path++) (*tmp_paths)[c_path].set_charset(&my_charset_utf8_general_ci); } |