database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge amd64.(none):/src/mysql-5.1-maint

Browse Source 
into  amd64.(none):/src/mysql-5.1-build_29903


BitKeeper/etc/ignore:
  auto-union
client/client_priv.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
  Auto merged
client/mysql.cc:
  Auto merged
libmysqld/CMakeLists.txt:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
  Manual merge.
This commit is contained in:
unknown
2007-08-03 21:44:59 -04:00
parent a455d7f97e ac107ac16a
commit e8469adb17
10 changed files with 159 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/mysql-test-run.pl
View File

@ -693,6 +693,37 @@ sub command_line_setup () {
$glob_timers= mtr_init_timers();
# --------------------------------------------------------------------------
# Embedded server flag
# --------------------------------------------------------------------------
if ( $opt_embedded_server )
{
$glob_use_embedded_server= 1;
# Add the location for libmysqld.dll to the path.
if ( $glob_win32 )
{
my $lib_mysqld=
mtr_path_exists(vs_config_dirs('libmysqld',''));
$lib_mysqld= $glob_cygwin_perl ? ":".`cygpath "$lib_mysqld"`
: ";".$lib_mysqld;
chomp($lib_mysqld);
$ENV{'PATH'}="$ENV{'PATH'}".$lib_mysqld;
}
push(@glob_test_mode, "embedded");
$opt_skip_rpl= 1; # We never run replication with embedded
$opt_skip_ndbcluster= 1; # Turn off use of NDB cluster
$opt_skip_ssl= 1; # Turn off use of SSL
# Turn off use of bin log
push(@opt_extra_mysqld_opt, "--skip-log-bin");
if ( $opt_extern )
{
mtr_error("Can't use --extern with --embedded-server");
}
}
#
# Find the mysqld executable to be able to find the mysqld version
# number as early as possible