From 232abd5f6ee8c1deb83533631441b8a5a91a800d Mon Sep 17 00:00:00 2001
From: "pem@mysql.comhem.se" <>
Date: Fri, 12 Nov 2004 13:02:17 +0100
Subject: [PATCH] Fixed merge bug(?) in mysqldump.c.

---
 client/mysqldump.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 40dfb304a21..3544786ab1c 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -352,7 +352,8 @@ static struct my_option my_long_options[] =
   {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
     (gptr*) &opt_net_buffer_length, (gptr*) &opt_net_buffer_length, 0,
     GET_ULONG, REQUIRED_ARG, 1024*1024L-1025, 4096, 16*1024L*1024L,
-    MALLOC_OVERHEAD-1024, 1024, 0}
+    MALLOC_OVERHEAD-1024, 1024, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
 static const char *load_default_groups[]= { "mysqldump","client",0 };