Skip to content

M
mariadb
Commit 7ba94c67 authored by unknown's avatar unknown
Browse files
Options

libmysql.c: 

  fix merge conflict


libmysql/libmysql.c:
  fix merge conflict
parent 9f51a0e6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
libmysql/libmysql.c
View file @ 7ba94c67
...@@ -927,11 +927,8 @@ static const char *default_options[]= ...@@ -927,11 +927,8 @@ static const char *default_options[]=
"character-sets-dir", "default-character-set", "interactive-timeout", "character-sets-dir", "default-character-set", "interactive-timeout",
"connect-timeout", "local-infile", "disable-local-infile", "connect-timeout", "local-infile", "disable-local-infile",
"replication-probe", "enable-reads-from-master", "repl-parse-query", "replication-probe", "enable-reads-from-master", "repl-parse-query",
"ssl-cipher","protocol", "ssl-cipher","protocol", "shared_memory_base_name",
red_memory_base_name", NullS
NullS
}; };
static TYPELIB option_types={array_elements(default_options)-1, static TYPELIB option_types={array_elements(default_options)-1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7