bk commit into 4.1 tree (msvensson:1.2561)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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@stripped, 2006-11-28 15:15:01+01:00, msvensson@neptunus.(none) +1 -0
  Rename function datadir_setup to datadir_list_setup to avoid mixup
  with the function where vardir's are created

  mysql-test/mysql-test-run.pl@stripped, 2006-11-28 15:14:52+01:00, msvensson@neptunus.(none) +3 -3
    Rename function datadir_setup to datadir_list_setup to avoid mixup
    with the function where vardir's are created

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/work/my41-work

--- 1.150/mysql-test/mysql-test-run.pl	2006-11-28 15:15:23 +01:00
+++ 1.151/mysql-test/mysql-test-run.pl	2006-11-28 15:15:23 +01:00
@@ -308,7 +308,7 @@ our %mysqld_variables;
 sub main ();
 sub initial_setup ();
 sub command_line_setup ();
-sub datadir_setup ();
+sub datadir_list_setup ();
 sub executable_setup ();
 sub environment_setup ();
 sub kill_running_servers ();
@@ -1185,7 +1185,7 @@ sub command_line_setup () {
   $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/";
 }
 
-sub datadir_setup () {
+sub datadir_list_setup () {
 
   # Make a list of all data_dirs
   @data_dir_lst = (
@@ -2534,7 +2534,7 @@ sub run_suite () {
 
 sub initialize_servers () {
 
-  datadir_setup();
+  datadir_list_setup();
 
   if ( $opt_extern )
   {