bk commit into 4.1 tree (holyfoot:1.2502) 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.2502 06/04/11 15:01:21 holyfoot@deer.(none) +3 -0
  bug #15442 (mysqltest.test doesn't work with the embedded server)

  mysql-test/t/mysqltest.test
    1.19 06/04/11 15:00:37 holyfoot@stripped +1 -0
    this test shouldn't work with the embedded server

  mysql-test/mysql-test-run.sh
    1.265 06/04/11 15:00:37 holyfoot@stripped +1 -0
    no ndbcluster needed here

  mysql-test/mysql-test-run.pl
    1.63 06/04/11 15:00:37 holyfoot@stripped +1 -0
    no ndbcluster needed here

# 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.264/mysql-test/mysql-test-run.sh	Fri Apr  7 22:42:42 2006
+++ 1.265/mysql-test/mysql-test-run.sh	Tue Apr 11 15:00:37 2006
@@ -279,6 +279,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.62/mysql-test/mysql-test-run.pl	Sun Apr  9 01:27:27 2006
+++ 1.63/mysql-test/mysql-test-run.pl	Tue Apr 11 15:00:37 2006
@@ -678,6 +678,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;
 
     if ( $opt_extern )
     {

--- 1.18/mysql-test/t/mysqltest.test	Wed Mar  1 03:52:50 2006
+++ 1.19/mysql-test/t/mysqltest.test	Tue Apr 11 15:00:37 2006
@@ -1,3 +1,4 @@
+-- source include/not_embedded.inc
 
 # ============================================================================
 #