From: Marc Alff
Date: April 28 2011 5:08am
Subject: bzr push into mysql-trunk branch (marc.alff:3333 to 3334)
List-Archive: http://lists.mysql.com/commits/136265
Message-Id: <201104280508.p3S58Yxv020498@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3334 Marc Alff	2011-04-27
      Fixed broken define

    modified:
      include/mysql/psi/mysql_thread.h
 3333 Vasil Dimov	2011-04-28 [merge]
      Merge mysql-trunk-innodb -> mysql-trunk

    modified:
      mysql-test/suite/innodb/r/innodb_bug60196.result
      mysql-test/suite/innodb/t/innodb_bug60196.test
      storage/innobase/btr/btr0cur.c
      storage/innobase/dict/dict0boot.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/dict/dict0mem.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/hash0hash.h
      storage/innobase/include/log0recv.h
      storage/innobase/include/page0types.h
      storage/innobase/include/page0zip.ic
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/trx0purge.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/univ.i
      storage/innobase/include/ut0bh.ic
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0recv.c
      storage/innobase/mtr/mtr0log.c
      storage/innobase/os/os0file.c
      storage/innobase/page/page0zip.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0purge.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0uins.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/srv/srv0mon.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/ut/ut0bh.c
      storage/innobase/ut/ut0ut.c
=== modified file 'include/mysql/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h	2011-04-28 03:11:43 +0000
+++ b/include/mysql/psi/mysql_thread.h	2011-04-28 05:07:54 +0000
@@ -1120,7 +1120,7 @@ static inline int inline_mysql_cond_broa
 }
 
 static inline void inline_mysql_thread_register(
-#ifdef HAVE_PSI_THREAD__INTERFACE
+#ifdef HAVE_PSI_THREAD_INTERFACE
   const char *category,
   PSI_thread_info *info,
   int count

No bundle (reason: useless for push emails).