List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:July 20 2009 12:41pm
Subject:bzr push into mysql-5.4-mtr branch (Bjorn.Munch:2824 to 2825)
View as plain text  
 2825 Bjorn Munch	2009-07-20 [merge]
      merged some fixes from 5.1-mtr

    added:
      mysql-test/lib/v1/incompatible.tests
    modified:
      .bzr-mysql/default.conf
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/SafeProcess/safe_process_win.cc
      mysql-test/lib/v1/mtr_cases.pl
      mysql-test/mysql-test-run.pl
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/disabled.def
 2824 Alexander Nozdrin	2009-07-12
      Update disabled tests aux files

    modified:
      mysql-test/extra/scripts/monitor_disabled_tests/comments.txt
      mysql-test/extra/scripts/monitor_disabled_tests/disabled_tags.txt
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-07-10 12:27:35 +0000
+++ b/.bzr-mysql/default.conf	2009-07-20 12:30:01 +0000
@@ -2,4 +2,4 @@
 tree_location = "bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-azalea"
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.4"
+tree_name = "mysql-5.4-mtr"

=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm	2009-07-03 05:54:09 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2009-07-20 12:30:01 +0000
@@ -204,8 +204,10 @@ my @mysqld_rules=
  { 'port' => \&fix_port },
  { 'socket' => \&fix_socket },
  { '#log-error' => \&fix_log_error },
- { 'log' => \&fix_log },
- { 'log-slow-queries' => \&fix_log_slow_queries },
+ { 'general_log' => 1 },
+ { 'general_log_file' => \&fix_log },
+ { 'slow_query_log' => 1 },
+ { 'slow_query_log_file' => \&fix_log_slow_queries },
  { '#user' => sub { return shift->{ARGS}->{user} || ""; } },
  { '#password' => sub { return shift->{ARGS}->{password} || ""; } },
  { 'server-id' => \&fix_server_id, },

=== modified file 'mysql-test/lib/My/SafeProcess/safe_process_win.cc'
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-05-14 19:56:53 +0000
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc	2009-07-15 12:20:56 +0000
@@ -188,7 +188,14 @@ int main(int argc, const char** argv )
         die("No real args -> nothing to do");
       /* Copy the remaining args to child_arg */
       for (int j= i+1; j < argc; j++) {
-        to+= _snprintf(to, child_args + sizeof(child_args) - to, "%s ", argv[j]);
+	if (strchr (argv[j], ' ')) {
+	  /* Protect with "" if this arg contains a space */
+	  to+= _snprintf(to, child_args + sizeof(child_args) - to,
+                         "\"%s\" ", argv[j]);
+	} else {
+	  to+= _snprintf(to, child_args + sizeof(child_args) - to,
+	                 "%s ", argv[j]);
+	}
       }
       break;
     } else {

=== added file 'mysql-test/lib/v1/incompatible.tests'
--- a/mysql-test/lib/v1/incompatible.tests	1970-01-01 00:00:00 +0000
+++ b/mysql-test/lib/v1/incompatible.tests	2009-07-16 12:05:46 +0000
@@ -0,0 +1,6 @@
+# This file lists tests that cannot run in MTR v1 for some reason.
+# They will be skipped.
+# Any text following white space after full test name is ignored
+# Only exact test names can be used, no regexp.
+
+main.fulltext_plugin   # Refers to $SIMPLE_PARSER_OPT which is not set

=== modified file 'mysql-test/lib/v1/mtr_cases.pl'
--- a/mysql-test/lib/v1/mtr_cases.pl	2008-11-14 14:39:12 +0000
+++ b/mysql-test/lib/v1/mtr_cases.pl	2009-07-17 08:41:04 +0000
@@ -32,6 +32,7 @@ sub mtr_options_from_test_file($$);
 
 my $do_test;
 my $skip_test;
+my %incompatible;
 
 sub init_pattern {
   my ($from, $what)= @_;
@@ -47,6 +48,15 @@ sub init_pattern {
 }
 
 
+sub collect_incomp_tests {
+  open (INCOMP, "lib/v1/incompatible.tests");
+  while (<INCOMP>)
+  {
+    next unless /^\w/;
+    s/\s.*\n//;		      # Ignore anything from first white space
+    $incompatible{$_}= 1;
+  }
+}
 
 ##############################################################################
 #
@@ -58,6 +68,8 @@ sub collect_test_cases ($) {
   $do_test= init_pattern($::opt_do_test, "--do-test");
   $skip_test= init_pattern($::opt_skip_test, "--skip-test");
 
+  collect_incomp_tests();
+
   my $suites= shift; # Semicolon separated list of test suites
   my $cases = [];    # Array of hash
 
@@ -528,6 +540,13 @@ sub collect_one_test_case($$$$$$$$$) {
   $tinfo->{'component_id'} = $component_id;
   push(@$cases, $tinfo);
 
+  if (exists ($incompatible{$tinfo->{'name'}}))
+  {
+    $tinfo->{'skip'}= 1;
+    $tinfo->{'comment'}= "Test cannot run in mtr v1";
+    return;
+  }
+  
   # ----------------------------------------------------------------------
   # Skip some tests but include in list, just mark them to skip
   # ----------------------------------------------------------------------
@@ -841,7 +860,7 @@ sub collect_one_test_case($$$$$$$$$) {
     if ( $tinfo->{'innodb_test'} )
     {
       # This is a test that need innodb
-      if ( $::mysqld_variables{'innodb'} ne "TRUE" )
+      if ( $::mysqld_variables{'innodb'} eq "OFF" )
       {
 	# innodb is not supported, skip it
 	$tinfo->{'skip'}= 1;

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-07-03 05:54:09 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-07-20 12:30:01 +0000
@@ -1800,8 +1800,9 @@ sub environment_setup {
        $plugin_filename = "ha_example.so";
     }
     my $lib_example_plugin=
-      mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename),
-		      "$basedir/storage/example/.libs/".$plugin_filename);
+      mtr_file_exists(vs_config_dirs('storage/example', 'ha_example.dll'),
+		      "$basedir/storage/example/.libs/ha_example.so",
+		      "$basedir/lib/mysql/plugin/ha_example.so",);
     $ENV{'EXAMPLE_PLUGIN'}=
       ($lib_example_plugin ? basename($lib_example_plugin) : "");
     $ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=".
@@ -5198,7 +5199,7 @@ Options to control what test suites or c
   skip-rpl              Skip the replication test cases.
   big-test              Also run tests marked as "big"
   enable-disabled       Run also tests marked as disabled
-  print_testcases       Don't run the tests but print details about all the
+  print-testcases       Don't run the tests but print details about all the
                         selected tests, in the order they would be run.
 
 Options that specify ports

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-07-06 22:29:09 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-07-20 12:30:01 +0000
@@ -17,5 +17,3 @@ rpl_heartbeat_basic        : Bug#43828 S
 rpl_heartbeat_2slaves      : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)
 rpl_failed_optimize        : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).
 rpl_read_only              : WL#4284: Setting Read only won't succeed until all metadata locks are released.
-rpl_init_slave         : Bug#44920 2009-07006 pcrews MTR2 is not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
-

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-07-11 20:13:14 +0000
+++ b/mysql-test/t/disabled.def	2009-07-20 12:30:01 +0000
@@ -14,5 +14,4 @@ innodb_bug39438      : Bug#42383 2009-01
 query_cache_28249    : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 information_schema   : Bug#42893 2009-03-26 alik main.information_schema times out sporadically
 skip_name_resolve    : Bug#43006 2009-06-25 alik main.skip_name_resolve fails on Windows in PB2
-init_connect         : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
 mysql_locale_posix   : Bug#46131 2009-07-11 alik main.mysql_locale_posix fais, thus disabled


Attachment: [text/bzr-bundle] bzr/bjorn.munch@sun.com-20090720123001-dx2jiaieljw0dd3n.bundle
Thread
bzr push into mysql-5.4-mtr branch (Bjorn.Munch:2824 to 2825) Bjorn Munch20 Jul