Commit 486693e2 authored by holyfoot@mysql.com's avatar holyfoot@mysql.com

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

into mysql.com:/home/hf/work/mysql-4.1.mrg
parents 0007484c be9f6230
...@@ -678,6 +678,7 @@ sub command_line_setup () { ...@@ -678,6 +678,7 @@ sub command_line_setup () {
$glob_use_embedded_server= 1; $glob_use_embedded_server= 1;
push(@glob_test_mode, "embedded"); push(@glob_test_mode, "embedded");
$opt_skip_rpl= 1; # We never run replication with embedded $opt_skip_rpl= 1; # We never run replication with embedded
$opt_skip_ndbcluster= 1;
if ( $opt_extern ) if ( $opt_extern )
{ {
......
...@@ -279,6 +279,7 @@ while test $# -gt 0; do ...@@ -279,6 +279,7 @@ while test $# -gt 0; do
USE_EMBEDDED_SERVER=1 USE_EMBEDDED_SERVER=1
USE_MANAGER=0 NO_SLAVE=1 USE_MANAGER=0 NO_SLAVE=1
USE_RUNNING_SERVER="" USE_RUNNING_SERVER=""
USE_NDBCLUSTER=""
TEST_MODE="$TEST_MODE embedded" ;; TEST_MODE="$TEST_MODE embedded" ;;
--purify) --purify)
USE_PURIFY=1 USE_PURIFY=1
......
-- source include/not_embedded.inc
# ============================================================================ # ============================================================================
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment