diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
| commit | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch) | |
| tree | 9a539823cdf05f53574fdf91941b3a242025acba /sql/item_cmpfunc.cc | |
| parent | 0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff) | |
| parent | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff) | |
| download | mariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz | |
5.2 merge
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 5871fa6ba11..f0ba4917685 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2566,8 +2566,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) { |