summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-02-04 10:01:08 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-02-04 10:01:08 +0100
commitd87979b48c614dbba4afd1b235307ee354c27719 (patch)
tree2a0ff83e28961f964d1b89528aa44abc8e37eade
parent82f5981e7238588b1af78f6719d9d0fc5d191491 (diff)
parentad3ac55641f18172807b13423353f01377f76e6e (diff)
downloadmariadb-git-d87979b48c614dbba4afd1b235307ee354c27719.tar.gz
Merge branch '10.5' into 10.6
-rw-r--r--sql/sql_type_json.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_type_json.h b/sql/sql_type_json.h
index bfe065934db..b7fe5c8aa64 100644
--- a/sql/sql_type_json.h
+++ b/sql/sql_type_json.h
@@ -81,7 +81,7 @@ public:
}
bool Item_append_extended_type_info(Send_field_extended_metadata *to,
- const Item *item) const
+ const Item *item) const override
{
return set_format_name(to); // Send "format=json" in the protocol
}