Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.

1 files changed, 18 insertions, 9 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 46c5a3dffbc..28779c045b4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -585,6 +585,7 @@ sub main {
     }
     mtr_report_test($tinfo);
     push @$completed, $tinfo;
+    ++$num_tests
   }
 
   mtr_print_line();
@@ -600,7 +601,8 @@ sub main {
 
   if ( @$completed != $num_tests)
   {
-    mtr_error("Not all tests completed");
+    mtr_error("Not all tests completed (only ". scalar(@$completed) .
+              " of $num_tests)");
   }
 
   remove_vardir_subs() if $opt_clean_vardir;
@@ -1148,7 +1150,7 @@ sub command_line_setup {
              'skip-test=s'              => \&collect_option,
              'do-test=s'                => \&collect_option,
              'start-from=s'             => \&collect_option,
-             'big-test'                 => \$opt_big_test,
+             'big-test+'                => \$opt_big_test,
 	     'combination=s'            => \@opt_combinations,
              'skip-combinations'        => \&collect_option,
              'experimental=s'           => \@opt_experimentals,
@@ -1943,8 +1945,11 @@ sub collect_mysqld_features {
 	# Put variables into hash
 	if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
 	{
-	  # print "$1=\"$2\"\n";
-	  $mysqld_variables{$1}= $2;
+          my $name= $1;
+          my $value=$2;
+          $name =~ s/_/-/g;
+          # print "$name=\"$value\"\n";
+          $mysqld_variables{$name}= $value;
 	}
 	else
 	{
@@ -1998,8 +2003,11 @@ sub collect_mysqld_features_from_running_server ()
     # Put variables into hash
     if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
     {
-      # print "$1=\"$2\"\n";
-      $mysqld_variables{$1}= $2;
+      my $name= $1;
+      my $value=$2;
+      $name =~ s/_/-/g;
+      # print "$name=\"$value\"\n";
+      $mysqld_variables{$name}= $value;
     }
   }
 
@@ -4777,9 +4785,9 @@ sub extract_warning_lines ($$) {
      qr/Failed on request_dump/,
      qr/Slave: Can't drop database.* database doesn't exist/,
      qr/Slave: Operation DROP USER failed for 'create_rout_db'/,
-     qr|Checking table:   '\./mtr/test_suppressions'|,
+     qr|Checking table:   '\..mtr.test_suppressions'|,
      qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|,
-     qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|,
+     qr|mysqld: Table '\..mtr.test_suppressions' is marked as crashed and should be repaired|,
      qr|Can't open shared library.*ha_archive|,
      qr|InnoDB: Error: table 'test/bug39438'|,
      qr| entry '.*' ignored in --skip-name-resolve mode|,
@@ -6362,7 +6370,8 @@ Options to control what test suites or cases to run
                         list of suite names.
                         The default is: "$DEFAULT_SUITES"
   skip-rpl              Skip the replication test cases.
-  big-test              Also run tests marked as "big"
+  big-test              Also run tests marked as "big". Repeat this option
+                        twice to run only "big" tests.
   staging-run           Run a limited number of tests (no slow tests). Used
                         for running staging trees with valgrind.
   enable-disabled       Run also tests marked as disabled