183
183
static const char *tc_heuristic_recover_names[]=
185
"COMMIT", "ROLLBACK", NullS
185
"COMMIT", "ROLLBACK", NULL
187
187
static TYPELIB tc_heuristic_recover_typelib=
210
210
{&Arg_comparator::compare_row, &Arg_comparator::compare_e_row},
211
211
{&Arg_comparator::compare_decimal, &Arg_comparator::compare_e_decimal}};
213
const char *log_output_names[] = { "NONE", "FILE", NullS};
213
const char *log_output_names[] = { "NONE", "FILE", NULL};
214
214
static const unsigned int log_output_names_len[]= { 4, 4, 0 };
215
215
TYPELIB log_output_typelib= {array_elements(log_output_names)-1,"",
216
216
log_output_names,
290
290
ulong opt_binlog_rows_event_max_size;
291
const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
291
const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NULL};
292
292
TYPELIB binlog_format_typelib=
293
293
{ array_elements(binlog_format_names) - 1, "",
294
294
binlog_format_names, NULL };
2004
2004
{"unlock_tables", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_UNLOCK_TABLES]), SHOW_LONG_STATUS},
2005
2005
{"update", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_UPDATE]), SHOW_LONG_STATUS},
2006
2006
{"update_multi", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_UPDATE_MULTI]), SHOW_LONG_STATUS},
2007
{NullS, NullS, SHOW_LONG}
2007
{NULL, NULL, SHOW_LONG}
2010
2010
static int init_common_variables(const char *conf_file_name, int argc,
4159
4159
{"Threads_running", (char*) &thread_running, SHOW_INT},
4160
4160
{"Uptime", (char*) &show_starttime_cont, SHOW_FUNC},
4161
4161
{"Uptime_since_flush_status",(char*) &show_flushstatustime_cont, SHOW_FUNC},
4162
{NullS, NullS, SHOW_LONG}
4162
{NULL, NULL, SHOW_LONG}
4165
4165
static void print_version(void)
4252
4252
binlog_cache_use= binlog_cache_disk_use= 0;
4253
4253
max_used_connections= slow_launch_threads = 0;
4254
4254
mysqld_user= mysqld_chroot= opt_init_file= opt_bin_logname = 0;
4255
opt_mysql_tmpdir= my_bind_addr_str= NullS;
4255
opt_mysql_tmpdir= my_bind_addr_str= NULL;
4256
4256
memset(&mysql_tmpdir_list, 0, sizeof(mysql_tmpdir_list));
4257
4257
memset(&global_status_var, 0, sizeof(global_status_var));
4258
4258
key_map_full.set_all();
4778
4778
static void set_server_version(void)
4780
4780
char *end= strxmov(server_version, DRIZZLE_SERVER_VERSION,
4781
DRIZZLE_SERVER_SUFFIX_STR, NullS);
4781
DRIZZLE_SERVER_SUFFIX_STR, NULL);
4782
4782
if (opt_bin_log)
4783
4783
my_stpcpy(end, "-log"); // This may slow down system
4813
4813
if (!test_if_hard_path(dir))
4815
4815
strxnmov(tmp_path,sizeof(tmp_path)-1, mysql_real_data_home,
4819
4819
return !fn_format(to, name, dir, extension,
4824
4824
static void fix_paths(void)
4826
4826
char buff[FN_REFLEN],*pos;
4827
convert_dirname(mysql_home,mysql_home,NullS);
4827
convert_dirname(mysql_home,mysql_home,NULL);
4828
4828
/* Resolve symlinks to allow 'mysql_home' to be a relative symlink */
4829
4829
my_realpath(mysql_home,mysql_home,MYF(0));
4830
4830
/* Ensure that mysql_home ends in FN_LIBCHAR */
4834
4834
pos[0]= FN_LIBCHAR;
4837
convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS);
4837
convert_dirname(mysql_real_data_home,mysql_real_data_home,NULL);
4838
4838
(void) fn_format(buff, mysql_real_data_home, "", "",
4839
4839
(MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
4840
4840
(void) unpack_dirname(mysql_unpacked_real_data_home, buff);
4841
convert_dirname(language,language,NullS);
4841
convert_dirname(language,language,NULL);
4842
4842
(void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
4843
4843
(void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
4844
4844
(void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home);
4850
4850
if (test_if_hard_path(sharedir))
4851
4851
strmake(buff,sharedir,sizeof(buff)-1); /* purecov: tested */
4853
strxnmov(buff,sizeof(buff)-1,mysql_home,sharedir,NullS);
4854
convert_dirname(buff,buff,NullS);
4853
strxnmov(buff,sizeof(buff)-1,mysql_home,sharedir,NULL);
4854
convert_dirname(buff,buff,NULL);
4855
4855
(void) my_load_path(language,language,buff);
4857
4857
/* If --character-sets-dir isn't given, use shared library dir */
4858
4858
if (charsets_dir != mysql_charsets_dir)
4860
4860
strxnmov(mysql_charsets_dir, sizeof(mysql_charsets_dir)-1, buff,
4861
CHARSET_DIR, NullS);
4863
4863
(void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
4864
convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NullS);
4864
convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NULL);
4865
4865
charsets_dir=mysql_charsets_dir;
4867
4867
if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
4878
4878
if (opt_secure_file_priv)
4880
convert_dirname(buff, opt_secure_file_priv, NullS);
4880
convert_dirname(buff, opt_secure_file_priv, NULL);
4881
4881
my_free(opt_secure_file_priv, MYF(0));
4882
4882
opt_secure_file_priv= my_strdup(buff, MYF(MY_FAE));