diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | e1f748c0bd7e347dbefb831d64755d834845d15b (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /sql/rpl_mi.cc | |
| parent | 80935b8659411177bc3fca4e0eb9f7747577eb1d (diff) | |
| parent | ed9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff) | |
| download | mariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 9b0450b3f02..a775d3485c9 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -457,16 +457,13 @@ int flush_master_info(Master_info* mi, (1 + mi->ignore_server_ids.elements), MYF(MY_WME)); if (!ignore_server_ids_buf) DBUG_RETURN(1); - for (ulong i= 0, cur_len= my_sprintf(ignore_server_ids_buf, - (ignore_server_ids_buf, "%u", - mi->ignore_server_ids.elements)); - i < mi->ignore_server_ids.elements; i++) + ulong cur_len= sprintf(ignore_server_ids_buf, "%u", + mi->ignore_server_ids.elements); + for (ulong i= 0; i < mi->ignore_server_ids.elements; i++) { ulong s_id; get_dynamic(&mi->ignore_server_ids, (uchar*) &s_id, i); - cur_len +=my_sprintf(ignore_server_ids_buf + cur_len, - (ignore_server_ids_buf + cur_len, - " %lu", s_id)); + cur_len+= sprintf(ignore_server_ids_buf + cur_len, " %lu", s_id); } } @@ -487,7 +484,7 @@ int flush_master_info(Master_info* mi, of file we don't care about this garbage. */ char heartbeat_buf[sizeof(mi->heartbeat_period) * 4]; // buffer to suffice always - my_sprintf(heartbeat_buf, (heartbeat_buf, "%.3f", mi->heartbeat_period)); + sprintf(heartbeat_buf, "%.3f", mi->heartbeat_period); my_b_seek(file, 0L); my_b_printf(file, "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n%s\n%s\n", |