mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
libmysql.c:
fix merge conflict
This commit is contained in:
@ -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,
|
||||||
|
Reference in New Issue
Block a user