bzr push into mysql-trunk branch (marc.alff:3253 to 3254)

[Marc Alff]

 3254 Marc Alff	2011-07-12
      Fixed build warnings

    modified:
      mysys/psi_noop.cc
 3253 Luis Soares	2011-07-12 [merge]
      BUG#12695969
      
      Automerged empty cset from mysql-5.5.

=== modified file 'mysys/psi_noop.cc'
--- a/mysys/psi_noop.cc	2011-07-01 08:46:20 +0000
+++ b/mysys/psi_noop.cc	2011-07-12 12:10:20 +0000
@@ -25,6 +25,8 @@
 #include "my_sys.h"
 #include "mysql/psi/psi.h"
 
+C_MODE_START
+
 static void register_mutex_noop(const char *category,
                                 PSI_mutex_info *info,
                                 int count)
@@ -620,8 +622,6 @@ static PSI PSI_noop=
   end_statement_noop
 };
 
-C_MODE_START
-
 /**
   Hook for the instrumentation interface.
   Code implementing the instrumentation interface should register here.

No bundle (reason: useless for push emails).