mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/home/hf/work/mysql-4.1.15442
into mysql.com:/home/hf/work/mysql-4.1.mrg
This commit is contained in:
@ -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
|
|||||||
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
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
-- source include/not_embedded.inc
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user