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 | 1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20 (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /client | |
| parent | 024dba64b64f395151f6b95650e8ee69a1591428 (diff) | |
| parent | 11fae04527098cb6c266eae41188504bd22a5b52 (diff) | |
| download | mariadb-git-1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 9d85e24d03f..c0f929ff5d0 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -436,7 +436,7 @@ Exit_status Load_log_processor::process_first_event(const char *bname, ptr= fname + target_dir_name_len; memcpy(ptr,bname,blen); ptr+= blen; - ptr+= my_sprintf(ptr, (ptr, "-%x", file_id)); + ptr+= sprintf(ptr, "-%x", file_id); if ((file= create_unique_file(fname,ptr)) < 0) { diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 1fc9f179895..2be88d4484d 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -708,8 +708,7 @@ static int handle_request_for_tables(char *tables, uint length) if (opt_all_in_1) { /* No backticks here as we added them before */ - query_length= my_sprintf(query, - (query, "%s TABLE %s %s", op, tables, options)); + query_length= sprintf(query, "%s TABLE %s %s", op, tables, options); } else { |