bzr push into mysql-trunk branch (marc.alff:5391)

[Marc Alff]

 5391 Marc Alff	2013-01-18 [merge]
      Local merge

    modified:
      sql/sql_cache.cc
      sql/sql_cache.h
=== modified file 'unittest/gunit/CMakeLists.txt'
--- a/unittest/gunit/CMakeLists.txt	2013-01-16 16:38:07 +0000
+++ b/unittest/gunit/CMakeLists.txt	2013-01-18 09:37:07 +0000
@@ -300,7 +300,8 @@ IF (MERGE_UNITTESTS)
   TARGET_LINK_LIBRARIES(merge_large_tests-t sql binlog rpl master slave sql)
 
   IF(WITH_PERFSCHEMA_STORAGE_ENGINE)
-    TARGET_LINK_LIBRARIES(merge_large_tests-t perfschema pfs_server_stubs)
+    TARGET_LINK_LIBRARIES(merge_large_tests-t perfschema)
+    TARGET_LINK_LIBRARIES(merge_small_tests-t perfschema pfs_server_stubs)
   ENDIF()
 
   ADD_TEST(merge_large_tests merge_large_tests-t)

=== modified file 'unittest/gunit/gunit_test_main.cc'
--- a/unittest/gunit/gunit_test_main.cc	2012-12-04 12:48:34 +0000
+++ b/unittest/gunit/gunit_test_main.cc	2013-01-18 09:37:07 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,6 +57,8 @@ mysql_mutex_t LOCK_open;
 uint    opt_debug_sync_timeout= 0;
 pthread_key(MEM_ROOT**,THR_MALLOC);
 pthread_key(THD*, THR_THD);
+bool THR_THD_initialized= false;
+bool THR_MALLOC_initialized= false;
 
 extern "C" void sql_alloc_error_handler(void)
 {

=== modified file 'unittest/gunit/test_utils.h'
--- a/unittest/gunit/test_utils.h	2012-12-04 12:57:18 +0000
+++ b/unittest/gunit/test_utils.h	2013-01-18 09:37:07 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 
 extern pthread_key(MEM_ROOT**,THR_MALLOC);
 extern pthread_key(THD*, THR_THD);
+extern bool THR_THD_initialized;
+extern bool THR_MALLOC_initialized;
 extern mysql_mutex_t LOCK_open;
 extern uint    opt_debug_sync_timeout;
 extern "C" void sql_alloc_error_handler(void);

No bundle (reason: useless for push emails).