maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/maria-debug/

------------------------------------------------------------
revno: 2732 [merge]
revision-id: hakan@xxxxxxxxxxxx-20090918033703-3ztdey1rpydiaeds
parent: hakan@xxxxxxxxxxxx-20090918033054-zi01ib0tg2qt1l7m
parent: psergey@xxxxxxxxxxxx-20090918011529-3d7glu6ot7n0xqc9
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: maria-debug
timestamp: Fri 2009-09-18 05:37:03 +0200
message:
  Merge.
modified:
  mysql-test/lib/mtr_gcov.pl     sp1f-mtr_gcov.pl-20041230152646-g7ukx2aojk6vlfbrurijutdkqshwljue
  mysql-test/lib/process-purecov-annotations.pl processpurecovannota-20090825145959-3tgucpo20ms8b5yb-1
  storage/maria/CMakeLists.txt   sp1f-cmakelists.txt-20060904145307-qtvi5bxnxyt7nzs4gtpsyte5vv3fwm2i

=== modified file 'mysql-test/lib/mtr_gcov.pl'
--- a/mysql-test/lib/mtr_gcov.pl	2009-08-25 15:02:55 +0000
+++ b/mysql-test/lib/mtr_gcov.pl	2009-09-18 01:15:29 +0000
@@ -64,7 +64,8 @@
 	$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);
   }

=== modified file 'mysql-test/lib/process-purecov-annotations.pl'
--- a/mysql-test/lib/process-purecov-annotations.pl	2009-08-25 15:02:55 +0000
+++ b/mysql-test/lib/process-purecov-annotations.pl	2009-09-18 01:15:29 +0000
@@ -47,7 +47,7 @@
     #
     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 @@
   }
   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);
 }
 
 

=== modified file 'storage/maria/CMakeLists.txt'
--- a/storage/maria/CMakeLists.txt	2008-06-09 09:06:06 +0000
+++ b/storage/maria/CMakeLists.txt	2009-09-09 18:11:31 +0000
@@ -50,6 +50,8 @@
 
   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)