diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
| commit | f84e28c119b495da77e197f7cd18af4048fc3126 (patch) | |
| tree | 5957008a7725e23cc6331b1251ff5d3f6b725076 /storage/innobase/pars/pars0pars.cc | |
| parent | ac2857a5fbf851d90171ac55f23385869ee6ba83 (diff) | |
| parent | e4901d9523ab838ea13bb0278980f8707aa2c581 (diff) | |
| download | mariadb-git-f84e28c119b495da77e197f7cd18af4048fc3126.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/pars/pars0pars.cc')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index a27411c3d8b..9f1aae9aa07 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2018, 2019, MariaDB Corporation. +Copyright (c) 2018, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -2356,7 +2356,6 @@ void pars_info_bind_id( /*==============*/ pars_info_t* info, /*!< in: info struct */ - ibool copy_name, /* in: copy name if TRUE */ const char* name, /*!< in: name */ const char* id) /*!< in: id */ { @@ -2379,8 +2378,7 @@ pars_info_bind_id( bid = static_cast<pars_bound_id_t*>( ib_vector_push(info->bound_ids, NULL)); - bid->name = (copy_name) - ? mem_heap_strdup(info->heap, name) : name; + bid->name = name; } bid->id = id; |