diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-29 18:27:16 +0300 |
|---|---|---|
| committer | Varun Gupta <varunraiko1803@gmail.com> | 2017-11-01 23:13:02 +0530 |
| commit | 24e219b179142b3708ff4bdf5ae3db96d6fa184a (patch) | |
| tree | dede0c065c0229dd765a8afd5a7ee22bb0f662c4 /sql/item_windowfunc.h | |
| parent | f4ba298abd06024f619659a4d9aae1e3fad97b08 (diff) | |
| download | mariadb-git-24e219b179142b3708ff4bdf5ae3db96d6fa184a.tar.gz | |
Remove has_error as a member from Item_sum and use THD::is_error() instead
Additionally, allow a query with window functions to be killed by the user during
its execution.
Diffstat (limited to 'sql/item_windowfunc.h')
| -rw-r--r-- | sql/item_windowfunc.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index a2357b24980..c1a8c594e20 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -767,7 +767,6 @@ public: if (prev_value >1 || prev_value < 0) { my_error(ER_ARGUMENT_OUT_OF_RANGE, MYF(0)); - has_error= TRUE; return true; } first_call= false; @@ -778,7 +777,6 @@ public: if (prev_value != arg_val) { my_error(ER_ARGUMENT_NOT_CONSTANT, MYF(0)); - has_error= TRUE; return true; } @@ -805,7 +803,6 @@ public: void clear() { - has_error= false; val_calculated= false; first_call= true; value->clear(); @@ -890,7 +887,6 @@ public: if (prev_value >1 || prev_value < 0) { my_error(ER_ARGUMENT_OUT_OF_RANGE, MYF(0)); - has_error= TRUE; return true; } } @@ -899,7 +895,6 @@ public: if (prev_value != arg_val) { my_error(ER_ARGUMENT_NOT_CONSTANT, MYF(0)); - has_error= TRUE; return true; } @@ -937,7 +932,6 @@ public: void clear() { first_call= true; - has_error= false; floor_value->clear(); ceil_value->clear(); floor_val_calculated= false; |