Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

Fix embedded server

pull/47/merge
msvensson@pilot.mysql.com 18 years ago
parent
de4f78d919
commit
0b547b26db
2 changed files with 64 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      mysql-test/lib/My/ConfigFactory.pm
  2. 70
      mysql-test/mysql-test-run.pl

26
mysql-test/lib/My/ConfigFactory.pm
View File

@ -295,7 +295,7 @@ my @mysqlbinlog_rules=
#
# Generate a [client.<suffix>] group pointing to be
# Generate a [client.<suffix>] group to be
# used for connecting to [mysqld.<suffix>]
#
sub post_check_client_group {
@ -347,6 +347,25 @@ sub post_check_client_groups {
}
#
# Generate [embedded] by copying the values
# needed from first [mysqld.<suffix>]
#
sub post_check_embedded_group {
my ($self, $config)= @_;
return unless $self->{ARGS}->{embedded};
my $first_mysqld= $config->first_like('mysqld.') or
croak "Can't run with embedded, config has no mysqld";
foreach my $option ( $first_mysqld->options() ) {
$config->insert('embedded', $option->name(), $option->value())
}
}
sub resolve_at_variable {
my ($self, $config, $group, $option)= @_;
@ -423,6 +442,7 @@ my @post_rules=
\&post_check_client_groups,
\&post_fix_mysql_cluster_section,
\&post_fix_resolve_at_variables,
\&post_check_embedded_group,
);
@ -567,13 +587,13 @@ sub new_config {
$config->insert('mysqlbinlog'),
@mysqlbinlog_rules);
# Additional reuls required for [client]
# Additional rules required for [client]
$self->run_rules_for_group($config,
$config->insert('client'),
@client_rules);
# Additional reuls required for [mysqltest]
# Additional rules required for [mysqltest]
$self->run_rules_for_group($config,
$config->insert('mysqltest'),
@mysqltest_rules);

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

@ -615,7 +615,6 @@ sub command_line_setup {
# --------------------------------------------------------------------------
if ( $opt_embedded_server )
{
$opt_embedded_server= 1;
if ( IS_WINDOWS )
{
# Add the location for libmysqld.dll to the path.
@ -2273,6 +2272,7 @@ sub run_testcase ($) {
user => $opt_user,
password => '',
ssl => $opt_ssl_supported,
embedded => $opt_embedded_server,
}
);
@ -2607,52 +2607,39 @@ sub mysqld_arguments ($$$) {
my $mysqld= shift;
my $extra_opts= shift;
my $prefix= ""; # If mysqltest server arg
if ( $opt_embedded_server )
{
$prefix= "--server-arg=";
}
mtr_add_arg($args, "%s--defaults-file=%s", $prefix, $path_config_file);
mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
# When mysqld is run by a root user(euid is 0), it will fail
# to start unless we specify what user to run as, see BUG#30630
my $euid= $>;
if (!IS_WINDOWS and $euid == 0 and
(grep(/^--user/, @$extra_opts)) == 0) {
mtr_add_arg($args, "%s--user=root", $prefix);
mtr_add_arg($args, "--user=root");
}
if ( $opt_valgrind_mysqld )
{
mtr_add_arg($args, "%s--skip-safemalloc", $prefix);
mtr_add_arg($args, "--skip-safemalloc");
if ( $mysql_version_id < 50100 )
{
mtr_add_arg($args, "%s--skip-bdb", $prefix);
mtr_add_arg($args, "--skip-bdb");
}
}
if ( $mysql_version_id >= 50106 )
{
# Turn on logging to both tables and file
mtr_add_arg($args, "%s--log-output=table,file", $prefix);
mtr_add_arg($args, "--log-output=table,file");
}
# Check if "extra_opt" contains skip-log-bin
my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opts);
if ( $opt_debug )
{
mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/%s.trace",
$prefix, $path_vardir_trace, $mysqld->name());
}
# Indicate to mysqld it will be debugged in debugger
if ( $glob_debugger )
{
mtr_add_arg($args, "%s--gdb", $prefix);
mtr_add_arg($args, "--gdb");
}
my $found_skip_core= 0;
@ -2669,12 +2656,12 @@ sub mysqld_arguments ($$$) {
}
else
{
mtr_add_arg($args, "%s%s", $prefix, $arg);
mtr_add_arg($args, "%s", $arg);
}
}
if ( !$found_skip_core )
{
mtr_add_arg($args, "%s%s", $prefix, "--core-file");
mtr_add_arg($args, "%s", "--core-file");
}
return $args;
@ -2702,8 +2689,15 @@ sub mysqld_start ($$) {
valgrind_arguments($args, \$exe);
}
mtr_add_arg($args, "--defaults-group-suffix=%s", $mysqld->after('mysqld'));
mysqld_arguments($args,$mysqld,$extra_opts);
if ( $opt_debug )
{
mtr_add_arg($args, "--debug=d:t:i:A,%s/log/%s.trace",
$path_vardir_trace, $mysqld->name());
}
if ( $opt_gdb || $opt_manual_gdb )
{
gdb_arguments(\$args, \$exe, $mysqld->name());
@ -3073,11 +3067,15 @@ sub start_servers($) {
return 1;
}
my $extra_opts= get_extra_opts($mysqld, $tinfo);
mysqld_start($mysqld,$extra_opts);
if (!$opt_embedded_server)
{
my $extra_opts= get_extra_opts($mysqld, $tinfo);
mysqld_start($mysqld,$extra_opts);
# Save this test case information, so next can examine it
$mysqld->{'started_tinfo'}= $tinfo;
}
# Save this test case information, so next can examine it
$mysqld->{'started_tinfo'}= $tinfo;
}
# Wait for clusters to start
@ -3094,6 +3092,8 @@ sub start_servers($) {
# Wait for mysqlds to start
foreach my $mysqld ( mysqlds() )
{
next if !started($mysqld);
if (sleep_until_file_created($mysqld->value('pid-file'),
$opt_start_timeout,
$mysqld->{'proc'}) == 0) {
@ -3252,10 +3252,22 @@ sub start_mysqltest ($) {
mtr_add_arg($args, "--skip-ssl");
}
if ( defined $tinfo->{'include_file'} ) {
mtr_add_arg($args, "--include=%s", $tinfo->{'include_file'}); # MASV
}
if ( $opt_embedded_server )
{
# Get the args needed for the embedded server
# and append them to args prefixed
# with --sever-arg=
my $mysqld= $config->group('embedded')
or mtr_error("Could not get [embedded] section");
my $mysqld_args;
mtr_init_args(\$mysqld_args);
my $extra_opts= get_extra_opts($mysqld, $tinfo);
mysqld_arguments($mysqld_args, $mysqld, $extra_opts);
mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args;
}
# ----------------------------------------------------------------------
# export MYSQL_TEST variable containing <path>/mysqltest <args>

Write Preview
Loading…
Cancel
Save