diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 06:27:55 +0300 |
| commit | 4f29d776c756ac522ae49c481ea8975dee8787fe (patch) | |
| tree | d152b05f3bca9b4022802654c129f0470ed92038 /sql/item_sum.cc | |
| parent | a4996f951d731322acc63033646d950ddbb0f60c (diff) | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| download | mariadb-git-4f29d776c756ac522ae49c481ea8975dee8787fe.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d68603d4ea7..3c468c72fa9 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1385,10 +1385,12 @@ Item_sum_sp::execute() bool res; uint old_server_status= thd->server_status; - /* We set server status so we can send a signal to exit from the - function with the return value. */ + /* + We set server status so we can send a signal to exit from the + function with the return value. + */ - thd->server_status= SERVER_STATUS_LAST_ROW_SENT; + thd->server_status|= SERVER_STATUS_LAST_ROW_SENT; res= Item_sp::execute(thd, &null_value, args, arg_count); thd->server_status= old_server_status; return res; |