diff options
| author | Monty <monty@mariadb.org> | 2018-01-08 15:33:23 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:56 +0200 |
| commit | f55dc7f733446a201e3b465ae03a0388d192a3ad (patch) | |
| tree | 54bb6977650a907dcd069ef1b7124e61944ceabe /sql/sql_error.cc | |
| parent | 18e22cb69f7d56207c80a5bf4336f2a52ff0d70f (diff) | |
| download | mariadb-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.cc')
| -rw-r--r-- | sql/sql_error.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index b1c7481bb8c..b4c6aff4f6d 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -769,12 +769,12 @@ void push_warning_printf(THD *thd, Sql_condition::enum_warning_level level, TRUE Error sending data to client */ -const LEX_STRING warning_level_names[]= +const LEX_CSTRING warning_level_names[]= { - { C_STRING_WITH_LEN("Note") }, - { C_STRING_WITH_LEN("Warning") }, - { C_STRING_WITH_LEN("Error") }, - { C_STRING_WITH_LEN("?") } + { STRING_WITH_LEN("Note") }, + { STRING_WITH_LEN("Warning") }, + { STRING_WITH_LEN("Error") }, + { STRING_WITH_LEN("?") } }; bool mysqld_show_warnings(THD *thd, ulong levels_to_show) |