diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-01-17 20:17:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-17 20:17:35 +0100 |
| commit | f7d030489d2980c9deb733925515099ec256f6d2 (patch) | |
| tree | 32673a800f903c26be547aa0f752cf4bd93d4923 /sql/item_func.cc | |
| parent | f797ea7124e906fd3abf311d66101a21dce2d27d (diff) | |
| parent | 6728aae3b34616cc98a7436ff93f318a15949a4b (diff) | |
| download | mariadb-git-f7d030489d2980c9deb733925515099ec256f6d2.tar.gz | |
Merge branch '10.0' into 10.1mariadb-10.1.21
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 5eff7538b61..623ff1128f3 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2767,7 +2767,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; @@ -2909,10 +2908,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; |