diff options
author | Monty <monty@mariadb.org> | 2018-01-07 18:03:44 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2018-01-30 21:33:55 +0200 |
commit | a7e352b54ddfaf91c92951d605cb02a4ffd2676b (patch) | |
tree | dc76f140342938ed2a0fe0e005100402762d5308 /sql/semisync_master.cc | |
parent | 921c5e931452301a09c84c53ffe35b81e6a1c71a (diff) | |
download | mariadb-git-a7e352b54ddfaf91c92951d605cb02a4ffd2676b.tar.gz |
Changed database, tablename and alias to be LEX_CSTRING
This was done in, among other things:
- thd->db and thd->db_length
- TABLE_LIST tablename, db, alias and schema_name
- Audit plugin database name
- lex->db
- All db and table names in Alter_table_ctx
- st_select_lex db
Other things:
- Changed a lot of functions to take const LEX_CSTRING* as argument
for db, table_name and alias. See init_one_table() as an example.
- Changed some function arguments from LEX_CSTRING to const LEX_CSTRING
- Changed some lists from LEX_STRING to LEX_CSTRING
- threads_mysql.result changed because process list_db wasn't always
correctly updated
- New append_identifier() function that takes LEX_CSTRING* as arguments
- Added new element tmp_buff to Alter_table_ctx to separate temp name
handling from temporary space
- Ensure we store the length after my_casedn_str() of table/db names
- Removed not used version of rename_table_in_stat_tables()
- Changed Natural_join_column::table_name and db_name() to never return
NULL (used for print)
- thd->get_db() now returns db as a printable string (thd->db.str or "")
Diffstat (limited to 'sql/semisync_master.cc')
-rw-r--r-- | sql/semisync_master.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index 99d8b75ece8..5e83847edf9 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -755,10 +755,10 @@ int Repl_semi_sync_master::dump_start(THD* thd, add_slave(); report_reply_binlog(thd->variables.server_id, log_file + dirname_length(log_file), log_pos); - sql_print_information("Start semi-sync binlog_dump to slave (server_id: %d), " - "pos(%s, %lu", - thd->variables.server_id, log_file, - (unsigned long)log_pos); + sql_print_information("Start semi-sync binlog_dump to slave " + "(server_id: %ld), pos(%s, %lu)", + (long) thd->variables.server_id, log_file, + (ulong) log_pos); return 0; } @@ -768,7 +768,8 @@ void Repl_semi_sync_master::dump_end(THD* thd) if (!thd->semi_sync_slave) return; - sql_print_information("Stop semi-sync binlog_dump to slave (server_id: %d)", thd->variables.server_id); + sql_print_information("Stop semi-sync binlog_dump to slave (server_id: %ld)", + (long) thd->variables.server_id); remove_slave(); ack_receiver.remove_slave(thd); |