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/sp_head.cc | |
| parent | f86d97c3fee0127d83c009e448f419ac857c72c7 (diff) | |
| parent | faf6d0ef3f9323c6d24f8cdb6533ed23d1a6bb40 (diff) | |
| download | mariadb-git-23047d3ed42eacb5eaa5475a8fa4161550d01c52.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index f840904def3..e61164e8e40 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -4648,7 +4648,7 @@ sp_instr_agg_cfetch::execute(THD *thd, uint *nextp) else { thd->spcont->pause_state= FALSE; - if (thd->server_status == SERVER_STATUS_LAST_ROW_SENT) + if (thd->server_status & SERVER_STATUS_LAST_ROW_SENT) { my_message(ER_SP_FETCH_NO_DATA, ER_THD(thd, ER_SP_FETCH_NO_DATA), MYF(0)); |