bzr push into mysql-5.6 branch (bjorn.munch:4224 to 4225) Bug#14581495

[Bjorn Munch]

 4225 Bjorn Munch	2012-09-05
      Bug #14581495 MTR MISTAKENLY TRIES TO USE MYSQL_CLIENT_TEST_EMBEDDED WHEN IN EMBEDDED MODE
      
        Fix is to never look for mysql_client_test_embedded.
        Also, return empty string instead of trying to process if not found.

    modified:
      mysql-test/mysql-test-run.pl
 4224 Bjorn Munch	2012-09-04
      Remove mysql_client_test_embedded from SVR4 builds

    modified:
      libmysqld/examples/CMakeLists.txt
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-07-18 10:48:34 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-09-05 08:57:19 +0000
@@ -2163,17 +2163,10 @@ sub mysqldump_arguments ($) {
 sub mysql_client_test_arguments(){
   my $exe;
   # mysql_client_test executable may _not_ exist
-  if ( $opt_embedded_server ) {
-    $exe= mtr_exe_maybe_exists(
-            vs_config_dirs('libmysqld/examples','mysql_client_test_embedded'),
-	      "$basedir/libmysqld/examples/mysql_client_test_embedded",
-		"$basedir/bin/mysql_client_test_embedded");
-  } else {
-    $exe= mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'),
-			       "$basedir/tests/mysql_client_test",
-			       "$basedir/bin/mysql_client_test");
-  }
-
+  $exe= mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'),
+			     "$basedir/tests/mysql_client_test",
+			     "$basedir/bin/mysql_client_test");
+  return "" unless $exe;
   my $args;
   mtr_init_args(\$args);
   if ( $opt_valgrind_mysqltest ) {

No bundle (reason: useless for push emails).