From 93fdc6a584fd3d49e23c78c16aa068b7c83a46be Mon Sep 17 00:00:00 2001
From: "venu@myvenu.com" <>
Date: Fri, 22 Nov 2002 10:52:52 -0800
Subject: [PATCH] libmysql.c:   fix merge conflict

---
 libmysql/libmysql.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 47df7acb0b1..410be65660f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -927,11 +927,8 @@ static const char *default_options[]=
   "character-sets-dir", "default-character-set", "interactive-timeout",
   "connect-timeout", "local-infile", "disable-local-infile",
   "replication-probe", "enable-reads-from-master", "repl-parse-query",
-  "ssl-cipher","protocol",
-red_memory_base_name",
-
-
- NullS
+  "ssl-cipher","protocol", "shared_memory_base_name",
+  NullS
 };
 
 static TYPELIB option_types={array_elements(default_options)-1,