summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-27 02:51:28 +0300
committerunknown <monty@mysql.com>2004-05-27 02:51:28 +0300
commit0ca66073056d01af13adc99e98903cc325594cd3 (patch)
tree308534bfb5e99b83732f79c04f7f5fddc8fcf998 /client
parent4375cf0608ae40fd15f7b0b6f3b45614cd184cf9 (diff)
parentacc895033efe66b3c404eb3c6a7cf190eb1ab8ed (diff)
downloadmariadb-git-0ca66073056d01af13adc99e98903cc325594cd3.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.c4
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 */