diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-07-16 22:12:09 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-07-16 22:12:09 +0200 |
commit | e7f4daf88c4348bb018d04d298b104617554f310 (patch) | |
tree | 8cb54b53e75db7fa848ad93c4a3640736116c97e /sql/protocol.cc | |
parent | 461cac890170c8a903972d4c8e6f4576cf8558e6 (diff) | |
parent | fc2ec25733c6f1a305bf14df960ee7a02b48ef2c (diff) | |
download | mariadb-git-e7f4daf88c4348bb018d04d298b104617554f310.tar.gz |
merge 10.5 to 10.6
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r-- | sql/protocol.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index c0a5f2327a0..1aea0dae3de 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -597,6 +597,7 @@ void Protocol::end_statement() thd->get_stmt_da()->get_sqlstate()); break; case Diagnostics_area::DA_EOF: + case Diagnostics_area::DA_EOF_BULK: error= send_eof(thd->server_status, thd->get_stmt_da()->statement_warn_count()); break; |