From 0ffaf19c53ccd102a369016cd01dec38ee9ac5a7 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 4 Apr 2022 09:45:29 +0400 Subject: Adding a "const" qualifier to arguments of create_func(), create_native() etc The "const" qualifier was obviously forgotten. This change will also simpily fixing of MDEV-27744. --- sql/item_create.cc | 334 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 201 insertions(+), 133 deletions(-) (limited to 'sql/item_create.cc') diff --git a/sql/item_create.cc b/sql/item_create.cc index 657397c41dd..52e0312f89b 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -49,7 +49,7 @@ class Create_func_arg0 : public Create_func { public: - virtual Item *create_func(THD *thd, LEX_CSTRING *name, + virtual Item *create_func(THD *thd, const LEX_CSTRING *name, List *item_list); /** @@ -74,7 +74,8 @@ protected: class Create_func_arg1 : public Create_func { public: - virtual Item *create_func(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_func(THD *thd, const LEX_CSTRING *name, + List *item_list); /** Builder method, with one argument. @@ -99,7 +100,8 @@ protected: class Create_func_arg2 : public Create_func { public: - virtual Item *create_func(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_func(THD *thd, const LEX_CSTRING *name, + List *item_list); /** Builder method, with two arguments. @@ -124,7 +126,8 @@ protected: class Create_func_arg3 : public Create_func { public: - virtual Item *create_func(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_func(THD *thd, const LEX_CSTRING *name, + List *item_list); /** Builder method, with three arguments. @@ -150,7 +153,9 @@ protected: class Create_sp_func : public Create_qfunc { public: - virtual Item *create_with_db(THD *thd, LEX_CSTRING *db, LEX_CSTRING *name, + virtual Item *create_with_db(THD *thd, + const LEX_CSTRING *db, + const LEX_CSTRING *name, bool use_explicit_name, List *item_list); static Create_sp_func s_singleton; @@ -173,7 +178,8 @@ protected: class Create_func_no_geom : public Create_func { public: - virtual Item *create_func(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_func(THD *thd, const LEX_CSTRING *name, + List *item_list); /** Singleton. */ static Create_func_no_geom s_singleton; @@ -319,7 +325,8 @@ protected: class Create_func_atan : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_atan s_singleton; @@ -553,7 +560,8 @@ protected: class Create_func_concat : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_concat s_singleton; @@ -566,7 +574,8 @@ protected: class Create_func_concat_operator_oracle : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_concat_operator_oracle s_singleton; @@ -592,7 +601,8 @@ protected: class Create_func_decode_oracle : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_decode_oracle s_singleton; @@ -605,7 +615,8 @@ protected: class Create_func_concat_ws : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_concat_ws s_singleton; @@ -830,7 +841,8 @@ protected: class Create_func_des_decrypt : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_des_decrypt s_singleton; @@ -843,7 +855,8 @@ protected: class Create_func_des_encrypt : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_des_encrypt s_singleton; @@ -911,7 +924,8 @@ class Create_func_distance : public Create_func_arg2 class Create_func_distance_sphere: public Create_native_func { public: - Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_distance_sphere s_singleton; protected: @@ -925,7 +939,8 @@ class Create_func_distance_sphere: public Create_native_func class Create_func_elt : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_elt s_singleton; @@ -951,7 +966,8 @@ protected: class Create_func_encrypt : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_encrypt s_singleton; @@ -1047,7 +1063,8 @@ protected: class Create_func_export_set : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_export_set s_singleton; @@ -1075,7 +1092,8 @@ protected: class Create_func_field : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_field s_singleton; @@ -1114,7 +1132,8 @@ protected: class Create_func_format : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_format s_singleton; @@ -1166,7 +1185,8 @@ protected: class Create_func_from_unixtime : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_from_unixtime s_singleton; @@ -1180,7 +1200,8 @@ protected: class Create_func_geometry_from_text : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_geometry_from_text s_singleton; @@ -1195,7 +1216,8 @@ protected: class Create_func_geometry_from_wkb : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_geometry_from_wkb s_singleton; @@ -1210,7 +1232,8 @@ protected: class Create_func_geometry_from_json : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_geometry_from_json s_singleton; @@ -1223,7 +1246,8 @@ protected: class Create_func_as_geojson : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_as_geojson s_singleton; @@ -1310,7 +1334,8 @@ protected: class Create_func_greatest : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_greatest s_singleton; @@ -1736,7 +1761,8 @@ protected: class Create_func_json_detailed: public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_detailed s_singleton; @@ -1801,7 +1827,8 @@ protected: class Create_func_json_keys: public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_keys s_singleton; @@ -1814,7 +1841,8 @@ protected: class Create_func_json_contains: public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_contains s_singleton; @@ -1827,7 +1855,8 @@ protected: class Create_func_json_contains_path : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_contains_path s_singleton; @@ -1840,7 +1869,8 @@ protected: class Create_func_json_extract : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_extract s_singleton; @@ -1853,7 +1883,8 @@ protected: class Create_func_json_search : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_search s_singleton; @@ -1866,7 +1897,8 @@ protected: class Create_func_json_array : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_array s_singleton; @@ -1879,7 +1911,8 @@ protected: class Create_func_json_array_append : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_array_append s_singleton; @@ -1892,7 +1925,8 @@ protected: class Create_func_json_array_insert : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_array_insert s_singleton; @@ -1905,7 +1939,8 @@ protected: class Create_func_json_insert : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_insert s_singleton; @@ -1918,7 +1953,8 @@ protected: class Create_func_json_set : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_set s_singleton; @@ -1931,7 +1967,8 @@ protected: class Create_func_json_replace : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_replace s_singleton; @@ -1944,7 +1981,8 @@ protected: class Create_func_json_remove : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_remove s_singleton; @@ -1957,7 +1995,8 @@ protected: class Create_func_json_object : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_object s_singleton; @@ -1970,7 +2009,8 @@ protected: class Create_func_json_length : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_length s_singleton; @@ -1983,7 +2023,8 @@ protected: class Create_func_json_merge : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_merge s_singleton; @@ -1996,7 +2037,8 @@ protected: class Create_func_json_merge_patch : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_json_merge_patch s_singleton; @@ -2048,7 +2090,8 @@ protected: class Create_func_last_insert_id : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_last_insert_id s_singleton; @@ -2074,7 +2117,8 @@ protected: class Create_func_least : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_least s_singleton; @@ -2166,7 +2210,8 @@ protected: class Create_func_locate : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_locate s_singleton; @@ -2179,7 +2224,8 @@ protected: class Create_func_log : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_log s_singleton; @@ -2218,7 +2264,7 @@ protected: class Create_func_lpad : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { return thd->variables.sql_mode & MODE_ORACLE ? @@ -2230,15 +2276,18 @@ public: protected: Create_func_lpad() {} virtual ~Create_func_lpad() {} - Item *create_native_std(THD *thd, LEX_CSTRING *name, List *items); - Item *create_native_oracle(THD *thd, LEX_CSTRING *name, List *items); + Item *create_native_std(THD *thd, const LEX_CSTRING *name, + List *items); + Item *create_native_oracle(THD *thd, const LEX_CSTRING *name, + List *items); }; class Create_func_lpad_oracle : public Create_func_lpad { public: - Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list) + Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { return create_native_oracle(thd, name, item_list); } @@ -2301,7 +2350,8 @@ protected: class Create_func_make_set : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_make_set s_singleton; @@ -2314,7 +2364,8 @@ protected: class Create_func_master_pos_wait : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_master_pos_wait s_singleton; @@ -2327,7 +2378,8 @@ protected: class Create_func_master_gtid_wait : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_master_gtid_wait s_singleton; @@ -2623,7 +2675,8 @@ protected: class Create_func_rand : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_rand s_singleton; @@ -2675,7 +2728,8 @@ protected: class Create_func_round : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_round s_singleton; @@ -2688,7 +2742,7 @@ protected: class Create_func_rpad : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { return thd->variables.sql_mode & MODE_ORACLE ? @@ -2700,15 +2754,18 @@ public: protected: Create_func_rpad() {} virtual ~Create_func_rpad() {} - Item *create_native_std(THD *thd, LEX_CSTRING *name, List *items); - Item *create_native_oracle(THD *thd, LEX_CSTRING *name, List *items); + Item *create_native_std(THD *thd, const LEX_CSTRING *name, + List *items); + Item *create_native_oracle(THD *thd, const LEX_CSTRING *name, + List *items); }; class Create_func_rpad_oracle : public Create_func_rpad { public: - Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list) + Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { return create_native_oracle(thd, name, item_list); } @@ -2931,7 +2988,7 @@ protected: class Create_func_substr_oracle : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, List *item_list); static Create_func_substr_oracle s_singleton; @@ -3115,7 +3172,8 @@ protected: class Create_func_unix_timestamp : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_unix_timestamp s_singleton; @@ -3277,7 +3335,8 @@ protected: class Create_func_year_week : public Create_native_func { public: - virtual Item *create_native(THD *thd, LEX_CSTRING *name, List *item_list); + virtual Item *create_native(THD *thd, const LEX_CSTRING *name, + List *item_list); static Create_func_year_week s_singleton; @@ -3321,7 +3380,7 @@ Create_func_no_geom Create_func_no_geom::s_singleton; Item* Create_func_no_geom::create_func(THD * /* unused */, - LEX_CSTRING /* unused */, + const LEX_CSTRING /* unused */, List * /* unused */) { /* FIXME: error message can't be translated. */ @@ -3333,7 +3392,8 @@ Create_func_no_geom::create_func(THD * /* unused */, Item* -Create_qfunc::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_qfunc::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { LEX_CSTRING db; @@ -3366,7 +3426,8 @@ Create_qfunc::create_func(THD *thd, LEX_CSTRING *name, List *item_list) Create_udf_func Create_udf_func::s_singleton; Item* -Create_udf_func::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_udf_func::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { udf_func *udf= find_udf(name->str, name->length); DBUG_ASSERT(udf); @@ -3476,7 +3537,9 @@ Create_udf_func::create(THD *thd, udf_func *udf, List *item_list) Create_sp_func Create_sp_func::s_singleton; Item* -Create_sp_func::create_with_db(THD *thd, LEX_CSTRING *db, LEX_CSTRING *name, +Create_sp_func::create_with_db(THD *thd, + const LEX_CSTRING *db, + const LEX_CSTRING *name, bool use_explicit_name, List *item_list) { int arg_count= 0; @@ -3524,7 +3587,8 @@ Create_sp_func::create_with_db(THD *thd, LEX_CSTRING *db, LEX_CSTRING *name, Item* -Create_native_func::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_native_func::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { if (unlikely(has_named_parameters(item_list))) { @@ -3537,7 +3601,8 @@ Create_native_func::create_func(THD *thd, LEX_CSTRING *name, List *item_li Item* -Create_func_arg0::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_func_arg0::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { int arg_count= 0; @@ -3555,7 +3620,8 @@ Create_func_arg0::create_func(THD *thd, LEX_CSTRING *name, List *item_list Item* -Create_func_arg1::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_func_arg1::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { int arg_count= 0; @@ -3581,7 +3647,8 @@ Create_func_arg1::create_func(THD *thd, LEX_CSTRING *name, List *item_list Item* -Create_func_arg2::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_func_arg2::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { int arg_count= 0; @@ -3609,7 +3676,8 @@ Create_func_arg2::create_func(THD *thd, LEX_CSTRING *name, List *item_list Item* -Create_func_arg3::create_func(THD *thd, LEX_CSTRING *name, List *item_list) +Create_func_arg3::create_func(THD *thd, const LEX_CSTRING *name, + List *item_list) { int arg_count= 0; @@ -3728,7 +3796,7 @@ Create_func_asin::create_1_arg(THD *thd, Item *arg1) Create_func_atan Create_func_atan::s_singleton; Item* -Create_func_atan::create_native(THD *thd, LEX_CSTRING *name, +Create_func_atan::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item* func= NULL; @@ -3919,7 +3987,7 @@ Create_func_dyncol_json::create_1_arg(THD *thd, Item *arg1) Create_func_concat Create_func_concat::s_singleton; Item* -Create_func_concat::create_native(THD *thd, LEX_CSTRING *name, +Create_func_concat::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -3942,7 +4010,7 @@ Create_func_concat_operator_oracle Create_func_concat_operator_oracle::s_singleton; Item* -Create_func_concat_operator_oracle::create_native(THD *thd, LEX_CSTRING *name, +Create_func_concat_operator_oracle::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -3970,7 +4038,7 @@ Create_func_decode_histogram::create_2_arg(THD *thd, Item *arg1, Item *arg2) Create_func_decode_oracle Create_func_decode_oracle::s_singleton; Item* -Create_func_decode_oracle::create_native(THD *thd, LEX_CSTRING *name, +Create_func_decode_oracle::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { uint arg_count= item_list ? item_list->elements : 0; @@ -3985,7 +4053,7 @@ Create_func_decode_oracle::create_native(THD *thd, LEX_CSTRING *name, Create_func_concat_ws Create_func_concat_ws::s_singleton; Item* -Create_func_concat_ws::create_native(THD *thd, LEX_CSTRING *name, +Create_func_concat_ws::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -4172,7 +4240,7 @@ Create_func_degrees::create_1_arg(THD *thd, Item *arg1) Create_func_des_decrypt Create_func_des_decrypt::s_singleton; Item* -Create_func_des_decrypt::create_native(THD *thd, LEX_CSTRING *name, +Create_func_des_decrypt::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4209,7 +4277,7 @@ Create_func_des_decrypt::create_native(THD *thd, LEX_CSTRING *name, Create_func_des_encrypt Create_func_des_encrypt::s_singleton; Item* -Create_func_des_encrypt::create_native(THD *thd, LEX_CSTRING *name, +Create_func_des_encrypt::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4288,7 +4356,7 @@ Create_func_distance::create_2_arg(THD *thd, Item *arg1, Item *arg2) Create_func_elt Create_func_elt::s_singleton; Item* -Create_func_elt::create_native(THD *thd, LEX_CSTRING *name, +Create_func_elt::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -4318,7 +4386,7 @@ Create_func_encode::create_2_arg(THD *thd, Item *arg1, Item *arg2) Create_func_encrypt Create_func_encrypt::s_singleton; Item* -Create_func_encrypt::create_native(THD *thd, LEX_CSTRING *name, +Create_func_encrypt::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4419,7 +4487,7 @@ Create_func_exp::create_1_arg(THD *thd, Item *arg1) Create_func_export_set Create_func_export_set::s_singleton; Item* -Create_func_export_set::create_native(THD *thd, LEX_CSTRING *name, +Create_func_export_set::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4484,7 +4552,7 @@ Create_func_exteriorring::create_1_arg(THD *thd, Item *arg1) Create_func_field Create_func_field::s_singleton; Item* -Create_func_field::create_native(THD *thd, LEX_CSTRING *name, +Create_func_field::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -4523,7 +4591,7 @@ Create_func_floor::create_1_arg(THD *thd, Item *arg1) Create_func_format Create_func_format::s_singleton; Item* -Create_func_format::create_native(THD *thd, LEX_CSTRING *name, +Create_func_format::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4588,7 +4656,7 @@ Create_func_from_days::create_1_arg(THD *thd, Item *arg1) Create_func_from_unixtime Create_func_from_unixtime::s_singleton; Item* -Create_func_from_unixtime::create_native(THD *thd, LEX_CSTRING *name, +Create_func_from_unixtime::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4627,7 +4695,7 @@ Create_func_from_unixtime::create_native(THD *thd, LEX_CSTRING *name, Create_func_geometry_from_text Create_func_geometry_from_text::s_singleton; Item* -Create_func_geometry_from_text::create_native(THD *thd, LEX_CSTRING *name, +Create_func_geometry_from_text::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4667,7 +4735,7 @@ Create_func_geometry_from_text::create_native(THD *thd, LEX_CSTRING *name, Create_func_geometry_from_wkb Create_func_geometry_from_wkb::s_singleton; Item* -Create_func_geometry_from_wkb::create_native(THD *thd, LEX_CSTRING *name, +Create_func_geometry_from_wkb::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -4707,8 +4775,8 @@ Create_func_geometry_from_wkb::create_native(THD *thd, LEX_CSTRING *name, Create_func_geometry_from_json Create_func_geometry_from_json::s_singleton; Item* -Create_func_geometry_from_json::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_geometry_from_json::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -4754,8 +4822,8 @@ Create_func_geometry_from_json::create_native(THD *thd, LEX_CSTRING *name, Create_func_as_geojson Create_func_as_geojson::s_singleton; Item* -Create_func_as_geojson::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_as_geojson::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -4856,7 +4924,7 @@ Create_func_glength::create_1_arg(THD *thd, Item *arg1) Create_func_distance_sphere Create_func_distance_sphere::s_singleton; Item* -Create_func_distance_sphere::create_native(THD *thd, LEX_CSTRING *name, +Create_func_distance_sphere::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -4877,7 +4945,7 @@ Create_func_distance_sphere::create_native(THD *thd, LEX_CSTRING *name, Create_func_greatest Create_func_greatest::s_singleton; Item* -Create_func_greatest::create_native(THD *thd, LEX_CSTRING *name, +Create_func_greatest::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -5170,8 +5238,8 @@ Create_func_json_exists::create_2_arg(THD *thd, Item *arg1, Item *arg2) Create_func_json_detailed Create_func_json_detailed::s_singleton; Item* -Create_func_json_detailed::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_detailed::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5297,7 +5365,7 @@ Create_func_last_day::create_1_arg(THD *thd, Item *arg1) Create_func_json_array Create_func_json_array::s_singleton; Item* -Create_func_json_array::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_array::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func; @@ -5319,8 +5387,8 @@ Create_func_json_array::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_array_append Create_func_json_array_append::s_singleton; Item* -Create_func_json_array_append::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_array_append::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5345,8 +5413,8 @@ Create_func_json_array_append::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_array_insert Create_func_json_array_insert::s_singleton; Item* -Create_func_json_array_insert::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_array_insert::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5371,8 +5439,8 @@ Create_func_json_array_insert::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_insert Create_func_json_insert::s_singleton; Item* -Create_func_json_insert::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_insert::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5398,7 +5466,7 @@ Create_func_json_insert::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_set Create_func_json_set::s_singleton; Item* -Create_func_json_set::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_set::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5425,7 +5493,7 @@ Create_func_json_set::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_replace Create_func_json_replace::s_singleton; Item* -Create_func_json_replace::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_replace::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5452,7 +5520,7 @@ Create_func_json_replace::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_remove Create_func_json_remove::s_singleton; Item* -Create_func_json_remove::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_remove::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5478,7 +5546,7 @@ Create_func_json_remove::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_object Create_func_json_object::s_singleton; Item* -Create_func_json_object::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_object::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func; @@ -5511,7 +5579,7 @@ Create_func_json_object::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_length Create_func_json_length::s_singleton; Item* -Create_func_json_length::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_length::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func; @@ -5536,7 +5604,7 @@ Create_func_json_length::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_merge Create_func_json_merge::s_singleton; Item* -Create_func_json_merge::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_merge::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func; @@ -5561,8 +5629,8 @@ Create_func_json_merge::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_merge_patch Create_func_json_merge_patch::s_singleton; Item* -Create_func_json_merge_patch::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_merge_patch::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func; int arg_count; @@ -5585,7 +5653,7 @@ Create_func_json_merge_patch::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_contains Create_func_json_contains::s_singleton; Item* -Create_func_json_contains::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_contains::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5611,7 +5679,7 @@ Create_func_json_contains::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_keys Create_func_json_keys::s_singleton; Item* -Create_func_json_keys::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_keys::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5637,8 +5705,8 @@ Create_func_json_keys::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_contains_path Create_func_json_contains_path::s_singleton; Item* -Create_func_json_contains_path::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_contains_path::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5663,8 +5731,8 @@ Create_func_json_contains_path::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_extract Create_func_json_extract::s_singleton; Item* -Create_func_json_extract::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_json_extract::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= 0; @@ -5689,7 +5757,7 @@ Create_func_json_extract::create_native(THD *thd, LEX_CSTRING *name, Create_func_json_search Create_func_json_search::s_singleton; Item* -Create_func_json_search::create_native(THD *thd, LEX_CSTRING *name, +Create_func_json_search::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5715,7 +5783,7 @@ Create_func_json_search::create_native(THD *thd, LEX_CSTRING *name, Create_func_last_insert_id Create_func_last_insert_id::s_singleton; Item* -Create_func_last_insert_id::create_native(THD *thd, LEX_CSTRING *name, +Create_func_last_insert_id::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5761,7 +5829,7 @@ Create_func_lcase::create_1_arg(THD *thd, Item *arg1) Create_func_least Create_func_least::s_singleton; Item* -Create_func_least::create_native(THD *thd, LEX_CSTRING *name, +Create_func_least::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -5843,7 +5911,7 @@ Create_func_load_file::create_1_arg(THD *thd, Item *arg1) Create_func_locate Create_func_locate::s_singleton; Item* -Create_func_locate::create_native(THD *thd, LEX_CSTRING *name, +Create_func_locate::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5884,7 +5952,7 @@ Create_func_locate::create_native(THD *thd, LEX_CSTRING *name, Create_func_log Create_func_log::s_singleton; Item* -Create_func_log::create_native(THD *thd, LEX_CSTRING *name, +Create_func_log::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5941,7 +6009,7 @@ Create_func_lpad Create_func_lpad::s_singleton; Create_func_lpad_oracle Create_func_lpad_oracle::s_singleton; Item* -Create_func_lpad::create_native_std(THD *thd, LEX_CSTRING *name, +Create_func_lpad::create_native_std(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -5973,7 +6041,7 @@ Create_func_lpad::create_native_std(THD *thd, LEX_CSTRING *name, Item* -Create_func_lpad::create_native_oracle(THD *thd, LEX_CSTRING *name, +Create_func_lpad::create_native_oracle(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= item_list ? item_list->elements : 0; @@ -6039,7 +6107,7 @@ Create_func_maketime::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *arg3) Create_func_make_set Create_func_make_set::s_singleton; Item* -Create_func_make_set::create_native(THD *thd, LEX_CSTRING *name, +Create_func_make_set::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= 0; @@ -6060,7 +6128,7 @@ Create_func_make_set::create_native(THD *thd, LEX_CSTRING *name, Create_func_master_pos_wait Create_func_master_pos_wait::s_singleton; Item* -Create_func_master_pos_wait::create_native(THD *thd, LEX_CSTRING *name, +Create_func_master_pos_wait::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { @@ -6111,7 +6179,7 @@ Create_func_master_pos_wait::create_native(THD *thd, LEX_CSTRING *name, Create_func_master_gtid_wait Create_func_master_gtid_wait::s_singleton; Item* -Create_func_master_gtid_wait::create_native(THD *thd, LEX_CSTRING *name, +Create_func_master_gtid_wait::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -6357,7 +6425,7 @@ Create_func_radians::create_1_arg(THD *thd, Item *arg1) Create_func_rand Create_func_rand::s_singleton; Item* -Create_func_rand::create_native(THD *thd, LEX_CSTRING *name, +Create_func_rand::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -6437,7 +6505,7 @@ Create_func_reverse::create_1_arg(THD *thd, Item *arg1) Create_func_round Create_func_round::s_singleton; Item* -Create_func_round::create_native(THD *thd, LEX_CSTRING *name, +Create_func_round::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -6477,7 +6545,7 @@ Create_func_rpad Create_func_rpad::s_singleton; Create_func_rpad_oracle Create_func_rpad_oracle::s_singleton; Item* -Create_func_rpad::create_native_std(THD *thd, LEX_CSTRING *name, +Create_func_rpad::create_native_std(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -6509,7 +6577,7 @@ Create_func_rpad::create_native_std(THD *thd, LEX_CSTRING *name, Item* -Create_func_rpad::create_native_oracle(THD *thd, LEX_CSTRING *name, +Create_func_rpad::create_native_oracle(THD *thd, const LEX_CSTRING *name, List *item_list) { int arg_count= item_list ? item_list->elements : 0; @@ -6690,8 +6758,8 @@ Create_func_substr_index::create_3_arg(THD *thd, Item *arg1, Item *arg2, Item *a Create_func_substr_oracle Create_func_substr_oracle::s_singleton; Item* -Create_func_substr_oracle::create_native(THD *thd, LEX_CSTRING *name, - List *item_list) +Create_func_substr_oracle::create_native(THD *thd, const LEX_CSTRING *name, + List *item_list) { Item *func= NULL; int arg_count= item_list ? item_list->elements : 0; @@ -6844,7 +6912,7 @@ Create_func_unhex::create_1_arg(THD *thd, Item *arg1) Create_func_unix_timestamp Create_func_unix_timestamp::s_singleton; Item* -Create_func_unix_timestamp::create_native(THD *thd, LEX_CSTRING *name, +Create_func_unix_timestamp::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; @@ -6999,7 +7067,7 @@ Create_func_y::create_1_arg(THD *thd, Item *arg1) Create_func_year_week Create_func_year_week::s_singleton; Item* -Create_func_year_week::create_native(THD *thd, LEX_CSTRING *name, +Create_func_year_week::create_native(THD *thd, const LEX_CSTRING *name, List *item_list) { Item *func= NULL; -- cgit v1.2.1