diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
| commit | 182599dd13f280ce4d51333bca98dbd5e4816bba (patch) | |
| tree | c02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /sql/sql_repl.cc | |
| parent | 774194634297aebf6ecbbda7c5601c796f43e5fc (diff) | |
| parent | 9a5fa17fd3c4885262e31bf14cf495d02e5f6b27 (diff) | |
| download | mariadb-git-182599dd13f280ce4d51333bca98dbd5e4816bba.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5f994c09d6d..d528dc64b5e 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1394,12 +1394,9 @@ bool change_master(THD* thd, Master_info* mi) /* Before processing the command, save the previous state. */ - char *pos; - pos= strmake(saved_host, mi->host, HOSTNAME_LENGTH); - pos= '\0'; + strmake(saved_host, mi->host, HOSTNAME_LENGTH); saved_port= mi->port; - pos= strmake(saved_log_name, mi->master_log_name, FN_REFLEN - 1); - pos= '\0'; + strmake(saved_log_name, mi->master_log_name, FN_REFLEN - 1); saved_log_pos= mi->master_log_pos; /* |