diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 17:30:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 17:30:02 +0300 |
| commit | 23047d3ed42eacb5eaa5475a8fa4161550d01c52 (patch) | |
| tree | e723067fea7cfb663ef7e4777e29ffd7dcd2905d /sql/item_sum.cc | |
| parent | f86d97c3fee0127d83c009e448f419ac857c72c7 (diff) | |
| parent | faf6d0ef3f9323c6d24f8cdb6533ed23d1a6bb40 (diff) | |
| download | mariadb-git-23047d3ed42eacb5eaa5475a8fa4161550d01c52.tar.gz | |
Merge 10.4 into 10.5
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 052ac173747..b676186f571 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1387,10 +1387,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; |