From: Mayank Prasad
Date: January 25 2012 10:46am
Subject: bzr push into mysql-trunk branch (mayank.prasad:3780 to 3781) Bug#13570079
List-Archive: http://lists.mysql.com/commits/142560
X-Bug: 13570079
Message-Id: <201201251046.q0PAkrDM003410@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3781 Mayank Prasad	2012-01-25
      Bug#13570079: - MAIN.MYSQL_EMBEDDED TEST FAILS ON WINDOWS-X86-64BIT ON DAILY-TRUNK
      
      Description: 
      -This test case (mysql_embedded) was failing on WINODWS 64 only.
      
      Issue:
      -In mysql_embedded test case, queries was wrappen in single
       quote ('), which was not treated as string delimiter. 
      
      Solution:
      -Changed single quote (') to double quote (") and test case
       is passing now.

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/mysql_embedded.test
 3780 Tor Didriksen	2012-01-25 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/r/bigint.result
      mysql-test/r/func_in_icp.result
      mysql-test/r/func_in_icp_mrr.result
      mysql-test/r/func_in_mrr.result
      mysql-test/r/func_in_mrr_cost.result
      mysql-test/r/func_in_none.result
      mysql-test/t/bigint.test
      sql/item.cc
      sql/item_cmpfunc.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-12-23 08:55:18 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-01-25 10:46:24 +0000
@@ -2014,7 +2014,8 @@ sub executable_setup () {
   $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mysql_plugin");
 
   $exe_mysql_embedded=
-    mtr_exe_maybe_exists("$bindir/libmysqld/examples/mysql_embedded",
+    mtr_exe_maybe_exists(vs_config_dirs('libmysqld/examples','mysql_embedded'),
+                         "$bindir/libmysqld/examples/mysql_embedded",
                          "$bindir/bin/mysql_embedded");
 
   if ( ! $opt_skip_ndbcluster )

=== modified file 'mysql-test/t/mysql_embedded.test'
--- a/mysql-test/t/mysql_embedded.test	2011-12-05 12:01:10 +0000
+++ b/mysql-test/t/mysql_embedded.test	2012-01-25 10:46:24 +0000
@@ -9,10 +9,10 @@ if(!$MYSQL_EMBEDDED)
 {
   --skip Test requires mysql_embedded executable
 }
---exec $MYSQL_EMBEDDED --defaults-file=$PATH_CONFIG_FILE -e 'select 1'
+--exec $MYSQL_EMBEDDED --defaults-file=$PATH_CONFIG_FILE -e "select 1"
 
 --echo #
 --echo # Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED
 --echo #
 
---exec $MYSQL_EMBEDDED --defaults-file=$PATH_CONFIG_FILE -e '\T foo/bar'
+--exec $MYSQL_EMBEDDED --defaults-file=$PATH_CONFIG_FILE -e "\T foo/bar"

No bundle (reason: useless for push emails).