From: Mayank Prasad
Date: November 4 2011 9:22am
Subject: bzr push into mysql-trunk branch (mayank.prasad:3557 to 3558) Bug#12561297
List-Archive: http://lists.mysql.com/commits/141732
X-Bug: 12561297
Message-Id: <201111040923.pA49N2qg018182@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3558 Mayank Prasad	2011-11-04
      Bug#12561297 : Enabled mysql_embedded.test test case
      
      Detail:
      - Added code to look for mysql_embedded executable in 
        bin directory.

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/t/disabled.def
 3557 Sunny Bains	2011-11-04
      Bug 12980094 - ASSERTION IN INNODB DETECTED IN RQG_PARTITION_DDL
      
      This bug is a debug code bug, it is only possible on platforms that don't
      support atomics.
      
      Release the rw_lock before freeing the underlying mutex. This fixes a race
      condition in rw_lock_list_print_info(), where the underlying mutex was freed
      but the rw_lock was still in the rw_lock_list.
      
      Approved by Jimmy Yang over IM.

    modified:
      storage/innobase/sync/sync0rw.c
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-10-14 15:13:18 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-11-04 09:18:36 +0000
@@ -1998,7 +1998,8 @@ sub executable_setup () {
   $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
   $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mysql_plugin");
 
-  $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded");
+  $exe_mysql_embedded= mtr_exe_maybe_exists("$basedir/libmysqld/examples/mysql_embedded",
+                                            "$bindir/bin/mysql_embedded");
 
   if ( ! $opt_skip_ndbcluster )
   {

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-08-03 18:22:00 +0000
+++ b/mysql-test/t/disabled.def	2011-11-04 09:18:36 +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-05-14 Anitha Dependent on PB2 changes - eventum#41836

No bundle (reason: useless for push emails).