bk commit into 5.0 tree (jani:1.1945)

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1945 05/06/15 10:28:50 jani@stripped +1 -0
  Local fix for 5.0.7 for Netware. Fixes some failing test cases on Netware.

  netware/mysql_test_run.c
    1.12 05/06/15 10:28:45 jani@stripped +4 -0
    Local fix for 5.0.7 for Netware. Fixes some failing test cases on Netware.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/jani/mydev/mysql-5.0.7-build-dev

--- 1.11/netware/mysql_test_run.c	2005-06-06 18:30:54 +03:00
+++ 1.12/netware/mysql_test_run.c	2005-06-15 10:28:45 +03:00
@@ -343,6 +343,7 @@
   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 @@
   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 @@
   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);
 }
 
 /******************************************************************************