bzr push into mysql-trunk branch (bjorn.munch:3081 to 3082)

[Bjorn Munch]

 3082 Bjorn Munch	2011-05-13 [merge]
      upmerge w/12549572

    modified:
      CMakeLists.txt
 3081 Tor Didriksen	2011-05-13
      Bug #11788245 - 60110 DO MORE THD AND GLOBAL INITIALIZATION FOR UNIT TESTING
      
      Move server/THD initialization to separate utility classes in namespace my_testing.
      Add new test as an example of how to use the utility classes.
     @ unittest/gunit/CMakeLists.txt
        Add test_utils.cc
     @ unittest/gunit/item-t.cc
        Use new utility classes.
     @ unittest/gunit/opt_range-t.cc
        Another example of using the utility classes.
     @ unittest/gunit/test_utils.cc
        Code moved from Item test, into new utility classes.
     @ unittest/gunit/test_utils.h
        Code moved from Item test, into new utility classes.

    added:
      unittest/gunit/opt_range-t.cc
      unittest/gunit/test_utils.cc
      unittest/gunit/test_utils.h
    modified:
      unittest/gunit/CMakeLists.txt
      unittest/gunit/item-t.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-03-22 11:14:23 +0000
+++ b/CMakeLists.txt	2011-05-13 11:58:02 +0000
@@ -172,6 +172,13 @@ IF(ENABLE_DEBUG_SYNC)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") 
 ENDIF() 
  
+OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
+IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
+  SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
+ENDIF()
+
 OPTION(ENABLED_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)

No bundle (reason: useless for push emails).