libmysql.c:

fix merge conflict libmysql/libmysql.c: fix merge conflict

libmysql.c:
fix merge conflict libmysql/libmysql.c: fix merge conflict
7ba94c67 · unknown · 9f51a0e6 · 7ba94c67
Commit 7ba94c67 authored Nov 22, 2002 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

libmysql/libmysql.c libmysql/libmysql.c +2 -5

No files found.
--- a/libmysql/libmysql.c
+++ b/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",
+  "ssl-cipher","protocol", "shared_memory_base_name",
-red_memory_base_name",
  NullS
 };