From: Marc Alff
Date: January 19 2013 2:48pm
Subject: bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3581 to 3582)
List-Archive: http://lists.mysql.com/commits/145619
Message-Id: <20130119144831.21902.85772.3582@linux-8edv.site>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3582 Marc Alff	2013-01-19
      cleanup

    modified:
      mysys/my_thr_init.c
 3581 Marc Alff	2013-01-19
      Cleanup

    removed:
      include/pfs_file_provider.h.moved
      include/pfs_idle_provider.h.moved
      include/pfs_socket_provider.h.moved
      include/pfs_stage_provider.h.moved
      include/pfs_statement_provider.h.moved
      include/pfs_table_provider.h.moved
      include/pfs_thread_provider.h.moved
      storage/perfschema/unittest/pfs_server_stubs.cc.moved
    modified:
      include/pfs_file_provider.h
      include/pfs_idle_provider.h
      include/pfs_socket_provider.h
      include/pfs_stage_provider.h
      include/pfs_statement_provider.h
      include/pfs_table_provider.h
      include/pfs_thread_provider.h
=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2013-01-18 10:19:48 +0000
+++ b/mysys/my_thr_init.c	2013-01-19 14:47:43 +0000
@@ -425,8 +425,9 @@ void my_thread_end(void)
 
 struct st_my_thread_var *_my_thread_var(void)
 {
-  DBUG_ASSERT(THR_KEY_mysys_initialized);
-  return  my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys);
+  if (THR_KEY_mysys_initialized)
+    return my_pthread_getspecific(struct st_my_thread_var*, THR_KEY_mysys);
+  return NULL;
 }
 
 int set_mysys_var(struct st_my_thread_var *mysys_var)

No bundle (reason: useless for push emails).