From 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 May 2012 10:13:25 +0300 Subject: fix of LP bug#998321 The problem is that we can't check null_value field of non-basic constant without the item execution.: --- sql/item_cmpfunc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/item_cmpfunc.cc') diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index c4d56a93af6..ea216944dbb 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2659,8 +2659,8 @@ Item_func_if::fix_length_and_dec() enum Item_result arg1_type=args[1]->result_type(); enum Item_result arg2_type=args[2]->result_type(); - bool null1=args[1]->const_item() && args[1]->null_value; - bool null2=args[2]->const_item() && args[2]->null_value; + bool null1=args[1]->basic_const_item() && args[1]->null_value; + bool null2=args[2]->basic_const_item() && args[2]->null_value; if (null1) { -- cgit v1.2.1