bzr push into mysql-trunk branch (bjorn.munch:4016 to 4017)

[Bjorn Munch]

 4017 Bjorn Munch	2012-07-10 [merge]
      mysql_client_test did not build within limbysqld/examples

    modified:
      libmysqld/examples/CMakeLists.txt
 4016 Sunny Bains	2012-07-10 [merge]
      Merge from mysql-5.6.

    modified:
      storage/innobase/trx/trx0trx.cc
=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2012-06-09 13:16:21 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2012-07-10 08:08:57 +0000
@@ -16,6 +16,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/regex 
+                    ${CMAKE_SOURCE_DIR}/tests
                     ${READLINE_INCLUDE_DIR}                 
                     )
 

No bundle (reason: useless for push emails).