Commit b0502fc2 authored by unknown's avatar unknown
Browse files

Fixes some of the failing test cases for Netware.

parent 894fd6ae

netware/mysql_test_run.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}



/******************************************************************************