mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/timka/mysql/src/5.0-virgin

Browse source 
into mysql.com:/home/timka/mysql/src/5.0-dbg
This commit is contained in:
unknown 2005-06-15 10:49:35 +03:00
commit fd39c731b0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netware/mysql_test_run.c
View file

@ -343,6 +343,7 @@ void start_master()
add_arg(&al, "--character-sets-dir=%s", char_dir);
add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
add_arg(&al, "--language=%s", lang_dir);
add_arg(&al, "--log-bin-trust-routine-creators");
#ifdef DEBUG //only for debug builds
add_arg(&al, "--debug");
#endif
@ -516,6 +517,7 @@ void start_slave()
add_arg(&al, "--master-retry-count=10");
add_arg(&al, "-O");
add_arg(&al, "slave_net_timeout=10");
add_arg(&al, "--log-bin-trust-routine-creators");
#ifdef DEBUG //only for debug builds
add_arg(&al, "--debug");
#endif
@ -1164,6 +1166,8 @@ void setup(char *file)
setenv("MYSQL_CLIENT_TEST",file_path,1);
snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port);
setenv("MYSQL",file_path,1);
snprintf(file_path, PATH_MAX*2, "%s/mysqlshow --no-defaults --user=root --port=%u", bin_dir, master_port);
setenv("MYSQL_SHOW",file_path,1);
}
/******************************************************************************