diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
| commit | f4dc139e753e95032fc333dbf30bd6f6800c7289 (patch) | |
| tree | 172c0cf755a99a530b5a757eba82daabb01ba056 /sql/mysqld.cc | |
| parent | c417457c7fc250f09d6a36b1dc982e3960dd9f10 (diff) | |
| parent | 31d552290c599dd1fc7b5f1ba6b9acb5bbfa6cfc (diff) | |
| download | mariadb-git-f4dc139e753e95032fc333dbf30bd6f6800c7289.tar.gz | |
Merge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f0785842040..080f78993a1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -671,6 +671,9 @@ static int defaults_argc; static char **defaults_argv; static char *opt_bin_logname; +int orig_argc; +char **orig_argv; + static my_socket unix_sock,ip_sock; struct rand_struct sql_rand; ///< used by sql_class.cc:THD::THD() @@ -2945,18 +2948,16 @@ pthread_handler_t handle_shutdown(void *arg) } #endif -#if !defined(EMBEDDED_LIBRARY) -static const char *load_default_groups[]= { +const char *load_default_groups[]= { #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE "mysql_cluster", #endif "mysqld","server", MYSQL_BASE_VERSION, 0, 0}; -#if defined(__WIN__) +#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) static const int load_default_groups_sz= sizeof(load_default_groups)/sizeof(load_default_groups[0]); #endif -#endif /*!EMBEDDED_LIBRARY*/ /** @@ -3244,6 +3245,8 @@ static int init_common_variables(const char *conf_file_name, int argc, SQLCOM_END + 8); #endif + orig_argc=argc; + orig_argv=argv; load_defaults(conf_file_name, groups, &argc, &argv); defaults_argv=argv; defaults_argc=argc; @@ -3909,6 +3912,7 @@ server."); if ((ho_error= handle_options(&defaults_argc, &tmp_argv, no_opts, mysqld_get_one_option))) unireg_abort(ho_error); + my_getopt_skip_unknown= TRUE; if (defaults_argc) { |