bk commit into 4.1 tree (holyfoot:1.2491) BUG#15442

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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.2491 06/01/18 15:29:23 holyfoot@deer.(none) +3 -0
  bug #15442 (mysqltest fails in embedded server)

  mysql-test/t/mysqltest.test
    1.18 06/01/18 15:28:35 holyfoot@stripped +2 -0
    mysqltest.test disabled in embedded

  mysql-test/mysql-test-run.sh
    1.259 06/01/18 15:28:35 holyfoot@stripped +1 -0
    ndb tests should be disabled in embedded server

  mysql-test/mysql-test-run.pl
    1.52 06/01/18 15:28:35 holyfoot@stripped +1 -0
    ndb test should be disabled in embedded server

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.15442

--- 1.258/mysql-test/mysql-test-run.sh	Thu Nov  3 15:02:02 2005
+++ 1.259/mysql-test/mysql-test-run.sh	Wed Jan 18 15:28:35 2006
@@ -271,6 +271,7 @@
       USE_EMBEDDED_SERVER=1
       USE_MANAGER=0 NO_SLAVE=1
       USE_RUNNING_SERVER=""
+      USE_NDBCLUSTER=""
       TEST_MODE="$TEST_MODE embedded" ;;
     --purify)
       USE_PURIFY=1

--- 1.51/mysql-test/mysql-test-run.pl	Mon Nov 14 03:58:39 2005
+++ 1.52/mysql-test/mysql-test-run.pl	Wed Jan 18 15:28:35 2006
@@ -634,6 +634,7 @@
     $glob_use_embedded_server= 1;
     push(@glob_test_mode, "embedded");
     $opt_skip_rpl= 1;              # We never run replication with embedded
+    $opt_skip_ndbcluster= 1;       # Avoid auto detection
 
     if ( $opt_extern )
     {

--- 1.17/mysql-test/t/mysqltest.test	Tue Sep 20 17:11:55 2005
+++ 1.18/mysql-test/t/mysqltest.test	Wed Jan 18 15:28:35 2006
@@ -1,3 +1,5 @@
+# mysqltest_embedded should be fixed to work with this
+-- source include/not_embedded.inc
 
 # ============================================================================
 #