diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-07-16 23:20:36 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-07-16 23:28:39 +0200 |
| commit | 74f5aa164eee447fe37d9bbdb8465dffc03164af (patch) | |
| tree | e6e5ef4c14ce16951ee6d2cd0c135a1cab8e3efc | |
| parent | e7f4daf88c4348bb018d04d298b104617554f310 (diff) | |
| download | mariadb-git-74f5aa164eee447fe37d9bbdb8465dffc03164af.tar.gz | |
MDEV-19237 - Fix assertion in should_send_column_info
COM_STMT_BULK_EXECUTE, just like COM_STMT_EXECUTE can also skip result set
metadata, if bulk is used with statement that returns result set, i.e
INSERT/DELETE RETURNING.
| -rw-r--r-- | sql/protocol.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 1aea0dae3de..7886ecd3043 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1136,7 +1136,8 @@ static bool should_send_column_info(THD* thd, List<Item>* list, uint flags) auto cmd= thd->get_command(); #endif - DBUG_ASSERT(cmd == COM_STMT_EXECUTE || cmd == COM_STMT_PREPARE); + DBUG_ASSERT(cmd == COM_STMT_EXECUTE || cmd == COM_STMT_PREPARE + || cmd == COM_STMT_BULK_EXECUTE); DBUG_ASSERT(cmd != COM_STMT_PREPARE || !column_info_state.initialized); bool ret= metadata_columns_changed(column_info_state, thd, *list); |