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/sp_head.cc | |
| parent | a4996f951d731322acc63033646d950ddbb0f60c (diff) | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| download | mariadb-git-4f29d776c756ac522ae49c481ea8975dee8787fe.tar.gz | |
Merge 10.3 into 10.4
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 6f1b720806c..6ad32ba91a0 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -4505,7 +4505,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)); |