bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3550 to 3551)

[Marc Alff]

 3551 Marc Alff	2012-07-04
      Build break

    modified:
      mysys/my_thr_init.c
 3550 Marc Alff	2012-07-04
      Code cleanup for Windows, different main()

    modified:
      sql/mysqld.cc
      storage/perfschema/pfs.cc
=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2012-07-04 08:23:23 +0000
+++ b/mysys/my_thr_init.c	2012-07-04 09:35:33 +0000
@@ -469,16 +469,16 @@ const char *my_thread_name(void)
 
 extern void **my_thread_var_dbug()
 {
+  struct st_my_thread_var *tmp;
   /*
     Instead of enforcing DBUG_ASSERT(THR_KEY_mysys_initialized) here,
     which causes any DBUG_ENTER and related traces to fail when
-    used in init / cleanup code, we are more tolerant here:
+    used in init / cleanup code, we are more tolerant:
     using DBUG_ENTER / DBUG_PRINT / DBUG_RETURN
     when the dbug instrumentation is not in place will do nothing.
   */
   if (! THR_KEY_mysys_initialized)
     return NULL;
-  struct st_my_thread_var *tmp;
   tmp= _my_thread_var();
   return tmp && tmp->init ? &tmp->dbug : 0;
 }

No bundle (reason: useless for push emails).