libmysql.c:

  fix merge conflict


libmysql/libmysql.c:
  fix merge conflict

libmysql/libmysql.c

@@ -927,10 +927,7 @@ 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",
-
-
+  "ssl-cipher","protocol", "shared_memory_base_name",
   NullS
 };