Commit f4c6c0ed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-4.1.15442 

into mysql.com:/home/hf/work/mysql-4.1.mrg
parents bb95643f 57ecf2b4

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ sub command_line_setup () { 
    $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 )

    {

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ while test $# -gt 0; do 
      USE_EMBEDDED_SERVER=1

      USE_MANAGER=0 NO_SLAVE=1

      USE_RUNNING_SERVER=""

      USE_NDBCLUSTER=""

      TEST_MODE="$TEST_MODE embedded" ;;

    --purify)

      USE_PURIFY=1

mysql-test/t/mysqltest.test

+1 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc



# ============================================================================

#