summaryrefslogtreecommitdiff
path: root/sql/sql_error.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-01-08 15:33:23 +0200
committerMonty <monty@mariadb.org>2018-01-30 21:33:56 +0200
commitf55dc7f733446a201e3b465ae03a0388d192a3ad (patch)
tree54bb6977650a907dcd069ef1b7124e61944ceabe /sql/sql_error.h
parent18e22cb69f7d56207c80a5bf4336f2a52ff0d70f (diff)
downloadmariadb-git-f55dc7f733446a201e3b465ae03a0388d192a3ad.tar.gz
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
Diffstat (limited to 'sql/sql_error.h')
-rw-r--r--sql/sql_error.h2
1 files changed, 1 insertions, 1 deletions
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);
/**