diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 16:09:26 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-08-01 16:09:26 +0400 |
| commit | be995467f0cc51ab20defceb2dd4dd35977133c2 (patch) | |
| tree | 4ee14089f16f0ecaa456e5d94e3fad2b2fcef199 /libmysqld | |
| parent | d89b19d43238d3c93b83fa705fa3aecbc684503b (diff) | |
| download | mariadb-git-be995467f0cc51ab20defceb2dd4dd35977133c2.tar.gz | |
MDEV-4786 - merge 10.0-monty - 10.0
Fixed main.partition_open_files_limit, innodb.innodb_bug12400341 failures.
These testcases use --max-connections=N command line option, which
was declared PARSE_EARLY during the merge. Embedded didn't handle
early options and failed to start due to unknown command line
option.
libmysqld/lib_sql.cc:
Let embedded handle early options.
sql/mysqld.cc:
Moved handling of early options to a separate function.
sql/mysqld.h:
Moved handling of early options to a separate function.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index d6dcf8f8d49..75188c38211 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -542,6 +542,10 @@ int init_embedded_server(int argc, char **argv, char **groups) system_charset_info= &my_charset_utf8_general_ci; sys_var_init(); + int ho_error= handle_early_options(); + if (ho_error != 0) + return 1; + if (init_common_variables()) { mysql_server_end(); |