diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 22:59:07 +0300 |
| commit | 391b5246fef4110bc73227c67f77eec5611a612e (patch) | |
| tree | 43a14c6ad76010ee31038173e53da44517c84dbe /sql/mysqld.cc | |
| parent | 92b1c2f3caafe6529a08992d7f134476c7b9ff70 (diff) | |
| parent | 27fca0ab1775a8c1dfe699c978b6448a7aa8f47b (diff) | |
| download | mariadb-git-391b5246fef4110bc73227c67f77eec5611a612e.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ed1572853bc..71fcef2479a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3265,7 +3265,8 @@ static int init_common_variables(const char *conf_file_name, int argc, orig_argc=argc; orig_argv=argv; - load_defaults(conf_file_name, groups, &argc, &argv); + if (load_defaults(conf_file_name, groups, &argc, &argv)) + return 1; defaults_argv=argv; defaults_argc=argc; if (get_options(&defaults_argc, defaults_argv)) @@ -7754,7 +7755,7 @@ static int mysql_init_variables(void) log_error_file_ptr= log_error_file; lc_messages_dir_ptr= lc_messages_dir; mysql_data_home= mysql_real_data_home; - thd_startup_options= (OPTION_AUTO_IS_NULL | OPTION_BIN_LOG | + thd_startup_options= (OPTION_BIN_LOG | OPTION_QUOTE_SHOW_CREATE | OPTION_SQL_NOTES); protocol_version= PROTOCOL_VERSION; what_to_log= ~ (1L << (uint) COM_TIME); |