From 74f5aa164eee447fe37d9bbdb8465dffc03164af Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 16 Jul 2021 23:20:36 +0200 Subject: [PATCH] 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. --- sql/protocol.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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* 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);