diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
| commit | 2195bb4e416232ab807ff67eecf03b1223bf6bff (patch) | |
| tree | 4555af02df68cb0f26d454b1cf65086b62542875 /sql/item_func.cc | |
| parent | 3ae038b732ce503fb839e9095355e05f5c6866f9 (diff) | |
| parent | bc4686f0f4d17dc57dd727c9f5390caa3022bdca (diff) | |
| download | mariadb-git-2195bb4e416232ab807ff67eecf03b1223bf6bff.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index f6162b54806..2e0596da2d1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2725,7 +2725,6 @@ void Item_func_min_max::fix_length_and_dec() decimals=0; max_length=0; maybe_null=0; - thd= current_thd; Item_result tmp_cmp_type= args[0]->cmp_type(); uint string_type_count= 0; uint temporal_type_count= 0; @@ -2867,10 +2866,8 @@ bool Item_func_min_max::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) longlong res= args[i]->val_temporal_packed(Item_func_min_max::field_type()); /* Check if we need to stop (because of error or KILL) and stop the loop */ - if (thd->is_error() || args[i]->null_value) - { + if (args[i]->null_value) return (null_value= 1); - } if (i == 0 || (res < min_max ? cmp_sign : -cmp_sign) > 0) min_max= res; |