From 6079b46d8d371262882d1bbe7ebeec23b2f83075 Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 2 Sep 2020 03:13:32 +0300 Subject: Split item->flags into base_flags and with_flags This was done to simplify copying of with_* flags Other things: - Changed Flags to C++ enums, which enables gdb to print out bit values for the flags. This also enables compiler errors if one tries to manipulate a non existing bit in a variable. - Added set_maybe_null() as a shortcut as setting the MAYBE_NULL flags was used in a LOT of places. - Renamed PARAM flag to SP_VAR to ensure it's not confused with persistent statement parameters. --- sql/item_jsonfunc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/item_jsonfunc.h') diff --git a/sql/item_jsonfunc.h b/sql/item_jsonfunc.h index af4221f0305..2ba515f448b 100644 --- a/sql/item_jsonfunc.h +++ b/sql/item_jsonfunc.h @@ -88,7 +88,7 @@ public: { if (Item_bool_func::fix_length_and_dec()) return TRUE; - flags|= ITEM_FLAG_MAYBE_NULL; + set_maybe_null(); return FALSE; } bool set_format_by_check_constraint(Send_field_extended_metadata *to) const -- cgit v1.2.1