From 4fa488fb0159c629483b7994aa84e73926b132b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 14:33:02 +0200 Subject: Merging upstream version 1:10.11.7. Signed-off-by: Daniel Baumann --- sql/protocol.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/protocol.h') diff --git a/sql/protocol.h b/sql/protocol.h index 4fdfde3e..09dbdfbd 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -229,9 +229,9 @@ public: #ifdef EMBEDDED_LIBRARY void remove_last_row() override; #endif - virtual bool store_field_metadata(const THD *thd, const Send_field &field, - CHARSET_INFO *charset_for_protocol, - uint pos); + bool store_field_metadata(const THD *thd, const Send_field &field, + CHARSET_INFO *charset_for_protocol, + uint pos); bool store_item_metadata(THD *thd, Item *item, uint pos); bool store_field_metadata_for_list_fields(const THD *thd, Field *field, const TABLE_LIST *table_list, -- cgit v1.2.3