diff options
| author | unknown <venu@myvenu.com> | 2002-11-22 10:52:52 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2002-11-22 10:52:52 -0800 |
| commit | 7ba94c67ca680cd36aa8b79011e3c6577318fec6 (patch) | |
| tree | 23960f987330e26671e00a2cabadcde48f389d5e /libmysql | |
| parent | 9f51a0e6ca2ce276215ea6afe186cde0919d7762 (diff) | |
| download | mariadb-git-7ba94c67ca680cd36aa8b79011e3c6577318fec6.tar.gz | |
libmysql.c:
fix merge conflict
libmysql/libmysql.c:
fix merge conflict
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
1 files 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, |