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/tztime.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/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 4a3119befd1..ad84c6c9bf0 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1478,10 +1478,10 @@ static bool time_zone_tables_exist= 1; static const LEX_CSTRING tz_tables_names[MY_TZ_TABLES_COUNT]= { - { C_STRING_WITH_LEN("time_zone_name")}, - { C_STRING_WITH_LEN("time_zone")}, - { C_STRING_WITH_LEN("time_zone_transition_type")}, - { C_STRING_WITH_LEN("time_zone_transition")} + { STRING_WITH_LEN("time_zone_name")}, + { STRING_WITH_LEN("time_zone")}, + { STRING_WITH_LEN("time_zone_transition_type")}, + { STRING_WITH_LEN("time_zone_transition")} }; class Tz_names_entry: public Sql_alloc |