summaryrefslogtreecommitdiff
path: root/netware
diff options
context:
space:
mode:
authorunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-06-15 10:25:03 +0300
committerunknown <jani@a193-229-222-105.elisa-laajakaista.fi>2005-06-15 10:25:03 +0300
commitb0502fc200e0dc6664d5e168750e6081f79f279a (patch)
tree52f30a1bab10c5fc566f24582a3d43e35b615fac /netware
parent894fd6ae07466eca193819295bd8332e5fd572c9 (diff)
downloadmariadb-git-b0502fc200e0dc6664d5e168750e6081f79f279a.tar.gz
Fixes some of the failing test cases for Netware.
Diffstat (limited to 'netware')
-rw-r--r--netware/mysql_test_run.c4
1 files changed, 4 insertions, 0 deletions
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);
}
/******************************************************************************