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 /storage/perfschema | |
parent | 461cac890170c8a903972d4c8e6f4576cf8558e6 (diff) | |
parent | fc2ec25733c6f1a305bf14df960ee7a02b48ef2c (diff) | |
download | mariadb-git-e7f4daf88c4348bb018d04d298b104617554f310.tar.gz |
merge 10.5 to 10.6
Diffstat (limited to 'storage/perfschema')
-rw-r--r-- | storage/perfschema/pfs.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/perfschema/pfs.cc b/storage/perfschema/pfs.cc index 1bb712f64cc..3e9198a6b6c 100644 --- a/storage/perfschema/pfs.cc +++ b/storage/perfschema/pfs.cc @@ -5466,6 +5466,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da) switch(da->status()) { case Diagnostics_area::DA_OK_BULK: + case Diagnostics_area::DA_EOF_BULK: case Diagnostics_area::DA_EMPTY: break; case Diagnostics_area::DA_OK: @@ -5706,6 +5707,7 @@ void pfs_end_statement_v1(PSI_statement_locker *locker, void *stmt_da) switch (da->status()) { case Diagnostics_area::DA_OK_BULK: + case Diagnostics_area::DA_EOF_BULK: case Diagnostics_area::DA_EMPTY: break; case Diagnostics_area::DA_OK: |