bzr push into mysql-trunk branch (mayank.prasad:3213 to 3214) Bug#12561297

[Mayank Prasad]

 3214 Mayank Prasad	2011-06-16 [merge]
      merge from 5.5 for test case issue for bug#12561297

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/disabled.def
      mysql-test/t/mysql_embedded.test
 3213 Vasil Dimov	2011-06-16 [merge]
      Merge mysql-5.5 -> mysql-trunk

    modified:
      storage/innobase/btr/btr0btr.c
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-05-30 14:00:14 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-06-16 13:56:45 +0000
@@ -171,6 +171,7 @@ our $exe_mysql;
 our $exe_mysqladmin;
 our $exe_mysqltest;
 our $exe_libtool;
+our $exe_mysql_embedded;
 
 our $opt_big_test= 0;
 
@@ -1952,6 +1953,8 @@ sub executable_setup () {
   $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
   $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
 
+  $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded");
+
   if ( ! $opt_skip_ndbcluster )
   {
     # Look for single threaded NDB
@@ -2356,6 +2359,7 @@ sub environment_setup {
   $ENV{'MYSQLADMIN'}=               native_path($exe_mysqladmin);
   $ENV{'MYSQL_CLIENT_TEST'}=        mysql_client_test_arguments();
   $ENV{'EXE_MYSQL'}=                $exe_mysql;
+  $ENV{'MYSQL_EMBEDDED'}=           $exe_mysql_embedded;
 
   # ----------------------------------------------------
   # bug25714 executable may _not_ exist in

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-06-15 03:06:10 +0000
+++ b/mysql-test/t/disabled.def	2011-06-16 13:56:45 +0000
@@ -16,4 +16,3 @@ alter_table-big          : Bug#11748731 
 create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
-mysql_embedded           : Bug#12561297 2011-06-15 New test failing on all platforms

=== modified file 'mysql-test/t/mysql_embedded.test'
--- a/mysql-test/t/mysql_embedded.test	2011-06-13 18:41:24 +0000
+++ b/mysql-test/t/mysql_embedded.test	2011-06-16 13:55:11 +0000
@@ -3,4 +3,10 @@
 --echo #
 
 --source include/is_embedded.inc
---exec $MYSQL_TEST_DIR/../libmysqld/examples/mysql_embedded -e 'select 1'
+
+# Test case require mysql_embedded to be present
+if(!$MYSQL_EMBEDDED)
+{
+  --skip Test requires mysql_embedded executable
+}
+--exec $MYSQL_EMBEDDED -e 'select 1'

No bundle (reason: useless for push emails).