Merge.

mysql-test/lib/mtr_gcov.pl

@@ -64,7 +64,8 @@ sub gcov_collect ($$$) {
 	$dir_reported= 1;
       }
       system("$gcov $f 2>>$start_dir/$gcov_err >>$start_dir/$gcov_msg");
-      system("perl $basedir/mysql-test/lib/process-purecov-annotations.pl $f.gcov");
+      system("perl", "$basedir/mysql-test/lib/process-purecov-annotations.pl", "$f.gcov");
+
     }
     chdir($start_dir);
   }

mysql-test/lib/process-purecov-annotations.pl

@@ -47,7 +47,7 @@ foreach my $in_file_name ( @ARGV )
     #
     my @arr= split(/:/, $line);
     if ($skipping || $line =~ /purecov: *(inspected|deadcode)/ || 
-        $arr[2] =~ m/^{ */)
+        $arr[2] =~ m/^{ *$/)
     {
       # Change '####' to '-'.
       $arr[0] =~ s/#####/    -/g;
@@ -57,8 +57,7 @@ foreach my $in_file_name ( @ARGV )
   }
   close(IN);
   close(OUT);
-  system("cat $out_file_name > $in_file_name");
-  system("rm $out_file_name");
+  system("mv", "-f", $out_file_name, $in_file_name);
 }
 
 

storage/maria/CMakeLists.txt

@@ -50,6 +50,8 @@ IF(NOT SOURCE_SUBLIBS)
 
   ADD_LIBRARY(maria ${MARIA_SOURCES})
 
+  ADD_DEPENDENCIES(maria GenError)
+
 ADD_EXECUTABLE(maria_ftdump maria_ftdump.c)
 TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32)