From b0502fc200e0dc6664d5e168750e6081f79f279a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Jun 2005 10:25:03 +0300 Subject: [PATCH] Fixes some of the failing test cases for Netware. --- netware/mysql_test_run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 45b7c4719fb..e8293103974 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -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); } /******************************************************************************