diff options
author | Monty <monty@mariadb.org> | 2020-08-14 19:51:10 +0300 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2021-05-19 22:27:28 +0200 |
commit | 7ca4e381f7af59dad07aebc5dc4f467b235ab962 (patch) | |
tree | 3de6d7b45fd61b0cd5da08c4dbb6b0482861aaf5 /sql/item_func.h | |
parent | 9448548481c590257f1523731fa81327db8db4ae (diff) | |
download | mariadb-git-7ca4e381f7af59dad07aebc5dc4f467b235ab962.tar.gz |
Removed Item::is_fixed() and Item::has_subquery()
One should instead use Item::fixed() and Item::with_subquery()
Removed Item::is_fixed() and has_subquery() and did the following replace:
replace is_fixed() fixed() -- *.*
replace 'has_subquery()' 'with_subquery()' -- *.*
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 7bef1f0d3dd..bac2b8d0f94 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -343,7 +343,7 @@ public: bool excl_dep_on_grouping_fields(st_select_lex *sel) { - if (has_rand_bit() || has_subquery()) + if (has_rand_bit() || with_subquery()) return false; return Item_args::excl_dep_on_grouping_fields(sel); } @@ -509,14 +509,14 @@ public: } double val_real(Item_handled_func *item) const { - DBUG_ASSERT(item->is_fixed()); + DBUG_ASSERT(item->fixed()); StringBuffer<64> tmp; String *res= item->val_str(&tmp); return res ? item->double_from_string_with_check(res) : 0.0; } longlong val_int(Item_handled_func *item) const { - DBUG_ASSERT(item->is_fixed()); + DBUG_ASSERT(item->fixed()); StringBuffer<22> tmp; String *res= item->val_str(&tmp); return res ? item->longlong_from_string_with_check(res) : 0; |