diff options
| author | unknown <guilhem@mysql.com> | 2004-11-16 00:14:46 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-11-16 00:14:46 +0100 |
| commit | 6e5c5b7839b274b81e905105b28188bce17abeb5 (patch) | |
| tree | 6fc4fa945cae3b8cf9f780703017402e7bf51728 /client | |
| parent | 445c9103a345c560d15beec8c7ad4c944c3b1d2c (diff) | |
| parent | 546e2d3192ed0b5745bf22cbc61f9aec44b426a8 (diff) | |
| download | mariadb-git-6e5c5b7839b274b81e905105b28188bce17abeb5.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 45b265569bb..99670dec89c 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1706,7 +1706,7 @@ static void dumpTable(uint numFields, char *table) else if (opt_hex_blob && is_blob) { /* sakaik got the idea to to provide blob's in hex notation. */ - unsigned char *ptr= row[i], *end= ptr+ lengths[i]; + char *ptr= row[i], *end= ptr+ lengths[i]; fputs("0x", md_result_file); for (; ptr < end ; ptr++) fprintf(md_result_file, "%02X", *ptr); @@ -2448,7 +2448,7 @@ int main(int argc, char **argv) } if (opt_master_data && do_show_master_status(sock)) goto err; - if (opt_single_transaction && do_unlock_tables(sock)) // unlock but no commit! + if (opt_single_transaction && do_unlock_tables(sock)) /* unlock but no commit! */ goto err; if (opt_alldbs) |