diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-27 21:50:16 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-10 07:20:49 +0100 |
| commit | 50c0939166afa2042a92d59698911fb54529ab39 (patch) | |
| tree | d37862b225823136bb06c4e049e798b56994e378 /sql/item_create.cc | |
| parent | a5584b13d1e04f38b843602413669591aa65c359 (diff) | |
| download | mariadb-git-50c0939166afa2042a92d59698911fb54529ab39.tar.gz | |
MDEV-20632: Recursive CTE cycle detection using CYCLE clause (nonstandard)
Added CYCLE ... RESTRICT (nonstandard) clause to recursive CTE.
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 57e402999ea..2bd605286d0 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2387,7 +2387,7 @@ static bool has_named_parameters(List<Item> *params) List_iterator<Item> it(*params); while ((param= it++)) { - if (! param->is_autogenerated_name) + if (! param->is_autogenerated_name()) return true; } } @@ -2633,7 +2633,7 @@ Create_func_arg1::create_func(THD *thd, LEX_CSTRING *name, List<Item> *item_list Item *param_1= item_list->pop(); - if (unlikely(! param_1->is_autogenerated_name)) + if (unlikely(! param_1->is_autogenerated_name())) { my_error(ER_WRONG_PARAMETERS_TO_NATIVE_FCT, MYF(0), name->str); return NULL; @@ -2660,8 +2660,8 @@ Create_func_arg2::create_func(THD *thd, LEX_CSTRING *name, List<Item> *item_list Item *param_1= item_list->pop(); Item *param_2= item_list->pop(); - if (unlikely(!param_1->is_autogenerated_name || - !param_2->is_autogenerated_name)) + if (unlikely(!param_1->is_autogenerated_name() || + !param_2->is_autogenerated_name())) { my_error(ER_WRONG_PARAMETERS_TO_NATIVE_FCT, MYF(0), name->str); return NULL; @@ -2689,9 +2689,9 @@ Create_func_arg3::create_func(THD *thd, LEX_CSTRING *name, List<Item> *item_list Item *param_2= item_list->pop(); Item *param_3= item_list->pop(); - if (unlikely(!param_1->is_autogenerated_name || - !param_2->is_autogenerated_name || - !param_3->is_autogenerated_name)) + if (unlikely(!param_1->is_autogenerated_name() || + !param_2->is_autogenerated_name() || + !param_3->is_autogenerated_name())) { my_error(ER_WRONG_PARAMETERS_TO_NATIVE_FCT, MYF(0), name->str); return NULL; |