summaryrefslogtreecommitdiff
path: root/mysql-test/mysql_test_run_new.c
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2005-11-10 17:53:09 +0100
committerunknown <guilhem@mysql.com>2005-11-10 17:53:09 +0100
commitfa22ce3f1ad9bd3d33bd00d505c71fe9c2cc9fc8 (patch)
tree8dffd13b9e21841c989e0f0841708b36f19e27b2 /mysql-test/mysql_test_run_new.c
parent73006d114f51dce06766422e6040d646d90378d3 (diff)
parent20285580ccf87fddc7045e9e2d898bbce0286530 (diff)
downloadmariadb-git-fa22ce3f1ad9bd3d33bd00d505c71fe9c2cc9fc8.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/home/mysql_src/mysql-5.0-release
Diffstat (limited to 'mysql-test/mysql_test_run_new.c')
-rw-r--r--mysql-test/mysql_test_run_new.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql_test_run_new.c b/mysql-test/mysql_test_run_new.c
index 33a69eba872..79db71fa274 100644
--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
@@ -486,7 +486,7 @@ void start_master()
#endif
add_arg(&al, "--local-infile");
add_arg(&al, "--core");
- add_arg(&al, "--log-bin-trust-routine-creators");
+ add_arg(&al, "--log-bin-trust-function-creators");
add_arg(&al, "--datadir=%s", master_dir);
#ifndef __WIN__
add_arg(&al, "--pid-file=%s", master_pid);