bk commit into 4.1 tree (msvensson:1.2593)

[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-10-20 17:09:07+02:00, msvensson@neptunus.(none) +1 -0
  Init some variables that changes between test cases direclty in run_testcase
  This can not be done in run_testcase_start_servers as embedded never starts a server
  Add error if mysqld_start is called in embedded mode 

  mysql-test/mysql-test-run.pl@stripped, 2006-10-20 17:09:06+02:00, msvensson@neptunus.(none) +10 -6
    Init some variables that changes between test cases direclty in run_testcase
    This can not be done in run_testcase_start_servers as embedded never starts a server
    Add error if mysqld_start is called in embedded mode 

# 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/mysql-4.1-maint

--- 1.121/mysql-test/mysql-test-run.pl	2006-10-20 17:09:10 +02:00
+++ 1.122/mysql-test/mysql-test-run.pl	2006-10-20 17:09:10 +02:00
@@ -2880,6 +2880,13 @@
 sub run_testcase ($) {
   my $tinfo=  shift;
 
+  # -------------------------------------------------------
+  # Init variables that can change between each test case
+  # -------------------------------------------------------
+
+  $ENV{'TZ'}= $tinfo->{'timezone'};
+  mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}");
+
   my $master_restart= run_testcase_need_master_restart($tinfo);
   my $slave_restart= run_testcase_need_slave_restart($tinfo);
 
@@ -3409,6 +3416,9 @@
   my $type= $mysqld->{'type'};
   my $idx= $mysqld->{'idx'};
 
+  mtr_error("Internal error: mysqld should never be started for embedded")
+    if $glob_use_embedded_server;
+
   if ( $type eq 'master' )
   {
     $exe= $exe_master_mysqld;
@@ -3848,12 +3858,6 @@
 sub run_testcase_start_servers($) {
   my $tinfo= shift;
   my $tname= $tinfo->{'name'};
-
-  # -------------------------------------------------------
-  # Init variables that can change between server starts
-  # -------------------------------------------------------
-  $ENV{'TZ'}= $tinfo->{'timezone'};
-  mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}");
 
   if ( $tinfo->{'component_id'} eq 'mysqld' )
   {