bzr push into mysql-trunk branch (marc.alff:3331 to 3332)

[Marc Alff]

 3332 Marc Alff	2011-04-27
      Fixed build break for
      cmake -DWITH_PERFSCHEMA_STORAGE_ENGINE=0 .

    modified:
      include/mysql/psi/mysql_file.h
      include/mysql/psi/mysql_thread.h
 3331 Serge Kozlov	2011-04-28
      BUG#11761610. Add waiting of binlog files from mysqlbinlog that running in background.

    modified:
      mysql-test/t/mysqlbinlog_raw_mode.test
=== modified file 'include/mysql/psi/mysql_file.h'
--- a/include/mysql/psi/mysql_file.h	2011-04-19 03:29:06 +0000
+++ b/include/mysql/psi/mysql_file.h	2011-04-28 03:11:43 +0000
@@ -512,7 +512,7 @@ static inline void inline_mysql_file_reg
   int count
 #else
   const char *category __attribute__ ((unused)),
-  PSI_file_info *info __attribute__ ((unused)),
+  void *info __attribute__ ((unused)),
   int count __attribute__ ((unused))
 #endif
 )

=== modified file 'include/mysql/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h	2011-04-19 03:29:06 +0000
+++ b/include/mysql/psi/mysql_thread.h	2011-04-28 03:11:43 +0000
@@ -582,7 +582,7 @@ static inline void inline_mysql_mutex_re
   int count
 #else
   const char *category __attribute__ ((unused)),
-  PSI_mutex_info *info __attribute__ ((unused)),
+  void *info __attribute__ ((unused)),
   int count __attribute__ ((unused))
 #endif
 )
@@ -725,7 +725,7 @@ static inline void inline_mysql_rwlock_r
   int count
 #else
   const char *category __attribute__ ((unused)),
-  PSI_rwlock_info *info __attribute__ ((unused)),
+  void *info __attribute__ ((unused)),
   int count __attribute__ ((unused))
 #endif
 )
@@ -998,7 +998,7 @@ static inline void inline_mysql_cond_reg
   int count
 #else
   const char *category __attribute__ ((unused)),
-  PSI_cond_info *info __attribute__ ((unused)),
+  void *info __attribute__ ((unused)),
   int count __attribute__ ((unused))
 #endif
 )
@@ -1126,7 +1126,7 @@ static inline void inline_mysql_thread_r
   int count
 #else
   const char *category __attribute__ ((unused)),
-  PSI_thread_info *info __attribute__ ((unused)),
+  void *info __attribute__ ((unused)),
   int count __attribute__ ((unused))
 #endif
 )

No bundle (reason: useless for push emails).