summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:33:33 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:33:33 +0300
commit6cb6ba8b7bd61c99e6122b7ab547f5f297b0fc1b (patch)
treed06577d9ddccd5f8a848e180343c24d4785808ba /plugin
parent7ae46ced37d3c19fb3e488e168f023e5c22a10c5 (diff)
parentb2baeba415b4c8564cd46a624a9cede8a033a9f3 (diff)
downloadmariadb-git-6cb6ba8b7bd61c99e6122b7ab547f5f297b0fc1b.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'plugin')
-rw-r--r--plugin/versioning/versioning.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugin/versioning/versioning.cc b/plugin/versioning/versioning.cc
index 6275fadba44..6d8f77550f6 100644
--- a/plugin/versioning/versioning.cc
+++ b/plugin/versioning/versioning.cc
@@ -30,7 +30,8 @@ template <TR_table::field_id_t TRT_FIELD>
class Create_func_trt : public Create_native_func
{
public:
- virtual Item *create_native(THD *thd, LEX_CSTRING *name, List<Item> *item_list);
+ virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
+ List<Item> *item_list);
static Create_func_trt<TRT_FIELD> s_singleton;
@@ -44,7 +45,7 @@ Create_func_trt<TRT_FIELD> Create_func_trt<TRT_FIELD>::s_singleton;
template <TR_table::field_id_t TRT_FIELD>
Item*
-Create_func_trt<TRT_FIELD>::create_native(THD *thd, LEX_CSTRING *name,
+Create_func_trt<TRT_FIELD>::create_native(THD *thd, const LEX_CSTRING *name,
List<Item> *item_list)
{
Item *func= NULL;
@@ -103,7 +104,8 @@ template <class Item_func_trt_trx_seesX>
class Create_func_trt_trx_sees : public Create_native_func
{
public:
- virtual Item *create_native(THD *thd, LEX_CSTRING *name, List<Item> *item_list)
+ virtual Item *create_native(THD *thd, const LEX_CSTRING *name,
+ List<Item> *item_list)
{
Item *func= NULL;
int arg_count= 0;