Merge branch '10.5' into 10.6

sanja-byelkin · sanja-byelkin · commit d87979b48c61 · 2022-02-04T10:01:08.000+01:00
diff --git a/sql/sql_type_json.h b/sql/sql_type_json.h
@@ -81,7 +81,7 @@ class Type_handler_general_purpose_string_to_json:
   }
 
   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
   }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class Type_handler_general_purpose_string_to_json:`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`bool Item_append_extended_type_info(Send_field_extended_metadata *to,`
`84`		`- const Item *item) const`
	`84`	`+ const Item *item) const override`
`85`	`85`	`{`
`86`	`86`	`return set_format_name(to); // Send "format=json" in the protocol`
`87`	`87`	`}`