bzr push into mysql-trunk branch (tor.didriksen:3197 to 3198)

[Tor Didriksen]

 3198 Tor Didriksen	2011-07-04 [merge]
      Merge 5.5 => trunk

    modified:
      cmake/build_configurations/mysql_release.cmake
 3197 Tor Didriksen	2011-07-04 [merge]
      Merge 5.5 => trunk

    modified:
      mysql-test/r/gis.result
      mysql-test/t/gis.test
      sql/field.h
      sql/field_conv.cc
=== modified file 'cmake/build_configurations/mysql_release.cmake'
--- a/cmake/build_configurations/mysql_release.cmake	2011-06-30 15:46:53 +0000
+++ b/cmake/build_configurations/mysql_release.cmake	2011-07-04 12:27:08 +0000
@@ -210,8 +210,8 @@ IF(UNIX)  
       IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         SET(COMMON_C_FLAGS                   "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
         SET(COMMON_CXX_FLAGS                 "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
-        SET(CMAKE_C_FLAGS_DEBUG              "${COMMON_C_FLAGS}")
-        SET(CMAKE_CXX_FLAGS_DEBUG            "${COMMON_CXX_FLAGS}")
+        SET(CMAKE_C_FLAGS_DEBUG              "-xO1 ${COMMON_C_FLAGS}")
+        SET(CMAKE_CXX_FLAGS_DEBUG            "-xO1 ${COMMON_CXX_FLAGS}")
         IF(32BIT)
           SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-xO2 ${COMMON_C_FLAGS}")
           SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_CXX_FLAGS}")

No bundle (reason: useless for push emails).