auto merge 5.1-rpl --> 5.1-rpl(local)

libmysqld/examples/CMakeLists.txt

@@ -32,7 +32,7 @@ ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
 TARGET_LINK_LIBRARIES(mysql_embedded debug dbug strings mysys vio yassl taocrypt regex ws2_32)
 ADD_DEPENDENCIES(mysql_embedded libmysqld)
 
-ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c)
+ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
 TARGET_LINK_LIBRARIES(mysqltest_embedded debug dbug strings mysys vio yassl taocrypt regex ws2_32)
 ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
 

mysql-test/lib/My/File/Path.pm

@@ -92,9 +92,16 @@ sub mkpath {
 
 
 sub copytree {
-  my ($from_dir, $to_dir) = @_;
+  my ($from_dir, $to_dir, $use_umask) = @_;
 
-  die "Usage: copytree(<fromdir>, <todir>" unless @_ == 2;
+  die "Usage: copytree(<fromdir>, <todir>, [<umask>])"
+    unless @_ == 2 or @_ == 3;
+
+  my $orig_umask;
+  if ($use_umask){
+    # Set new umask and remember the original
+    $orig_umask= umask(oct($use_umask));
+  }
 
   mkpath("$to_dir");
   opendir(DIR, "$from_dir")
@@ -114,6 +121,11 @@ sub copytree {
     copy("$from_dir/$_", "$to_dir/$_");
   }
   closedir(DIR);
+
+  if ($orig_umask){
+    # Set the original umask
+    umask($orig_umask);
+  }
 }
 
 1;

mysql-test/mysql-test-run.pl

@@ -1981,8 +1981,8 @@ sub setup_vardir() {
   }
 
   # copy all files from std_data into var/std_data
-  # and make them writable
-  copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data");
+  # and make them world readable
+  copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022");
 
   # Remove old log files
   foreach my $name (glob("r/*.progress r/*.log r/*.warnings"))
@@ -2544,6 +2544,7 @@ sub mysql_install_db {
   mtr_add_arg($args, "--basedir=%s", $install_basedir);
   mtr_add_arg($args, "--datadir=%s", $install_datadir);
   mtr_add_arg($args, "--loose-skip-innodb");
+  mtr_add_arg($args, "--loose-skip-falcon");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
   mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
   mtr_add_arg($args, "--core-file");