From f55dc7f733446a201e3b465ae03a0388d192a3ad Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 8 Jan 2018 15:33:23 +0200 Subject: Change C_STRING_WITH_LEN to STRING_WITH_LEN This preserves const str for constant strings Other things - A few variables where changed from LEX_STRING to LEX_CSTRING - Incident_log_event::Incident_log_event and record_incident where changed to take LEX_CSTRING* as an argument instead of LEX_STRING --- sql/sql_error.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_error.h') diff --git a/sql/sql_error.h b/sql/sql_error.h index b89af72cc44..c74f6519129 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -1245,7 +1245,7 @@ uint32 convert_error_message(char *to, uint32 to_length, const char *from, uint32 from_length, CHARSET_INFO *from_cs, uint *errors); -extern const LEX_STRING warning_level_names[]; +extern const LEX_CSTRING warning_level_names[]; bool is_sqlstate_valid(const LEX_CSTRING *sqlstate); /** -- cgit v1.2.1