diff options
author | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
commit | d000ea9c4db6cfb3dd2314ae66e89cc193131ffd (patch) | |
tree | 308534bfb5e99b83732f79c04f7f5fddc8fcf998 /client | |
parent | abd68407bf756cee304fda6d84b1e81716910fc3 (diff) | |
parent | 1d03d1629d64801681238152800bec49c4472afd (diff) | |
download | mariadb-git-d000ea9c4db6cfb3dd2314ae66e89cc193131ffd.tar.gz |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
netware/Makefile.am:
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 afeed2e03fd..2b40264325f 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1405,7 +1405,7 @@ static void dumpTable(uint numFields, char *table) if (opt_lock) fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table); - total_length=net_buffer_length; /* Force row break */ + total_length= opt_net_buffer_length; /* Force row break */ row_break=0; rownr=0; init_length=(uint) strlen(insert_pat)+4; @@ -1550,7 +1550,7 @@ static void dumpTable(uint numFields, char *table) ulong row_length; dynstr_append(&extended_row,")"); row_length = 2 + extended_row.length; - if (total_length + row_length < net_buffer_length) + if (total_length + row_length < opt_net_buffer_length) { total_length += row_length; fputc(',',md_result_file); /* Always row break */ |