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_repl.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_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 6e6b9b58ad2..84976b1e8a4 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -445,7 +445,7 @@ inline void fix_checksum(String *packet, ulong ev_offset) static user_var_entry * get_binlog_checksum_uservar(THD * thd) { - LEX_STRING name= { C_STRING_WITH_LEN("master_binlog_checksum")}; + LEX_CSTRING name= { STRING_WITH_LEN("master_binlog_checksum")}; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -695,7 +695,7 @@ void set_read_error(binlog_send_info *info, int error) static ulonglong get_heartbeat_period(THD * thd) { bool null_value; - LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")}; + LEX_CSTRING name= { STRING_WITH_LEN("master_heartbeat_period")}; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -714,7 +714,7 @@ static int get_mariadb_slave_capability(THD *thd) { bool null_value; - const LEX_STRING name= { C_STRING_WITH_LEN("mariadb_slave_capability") }; + const LEX_CSTRING name= { STRING_WITH_LEN("mariadb_slave_capability") }; const user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -735,7 +735,7 @@ get_slave_connect_state(THD *thd, String *out_str) { bool null_value; - const LEX_STRING name= { C_STRING_WITH_LEN("slave_connect_state") }; + const LEX_CSTRING name= { STRING_WITH_LEN("slave_connect_state") }; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -748,7 +748,7 @@ get_slave_gtid_strict_mode(THD *thd) { bool null_value; - const LEX_STRING name= { C_STRING_WITH_LEN("slave_gtid_strict_mode") }; + const LEX_CSTRING name= { STRING_WITH_LEN("slave_gtid_strict_mode") }; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -761,7 +761,7 @@ get_slave_gtid_ignore_duplicates(THD *thd) { bool null_value; - const LEX_STRING name= { C_STRING_WITH_LEN("slave_gtid_ignore_duplicates") }; + const LEX_CSTRING name= { STRING_WITH_LEN("slave_gtid_ignore_duplicates") }; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); @@ -782,7 +782,7 @@ get_slave_until_gtid(THD *thd, String *out_str) { bool null_value; - const LEX_STRING name= { C_STRING_WITH_LEN("slave_until_gtid") }; + const LEX_CSTRING name= { STRING_WITH_LEN("slave_until_gtid") }; user_var_entry *entry= (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str, name.length); |