bzr push into mysql-trunk-merge branch (davi:3137 to 3138) Bug#52514

[Davi Arnaut]

 3138 Davi Arnaut	2010-07-20
      Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
                 due to GCC preprocessor change
            
      Addendum for trunk: add -DMYSQL_ABI_CHECK to the cmake ABI check.

    modified:
      Makefile.am
      cmake/abi_check.cmake
 3137 Davi Arnaut	2010-07-20
      Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
                 due to GCC preprocessor change
      
      Addendum for trunk: do not include system header when checking
      the ABI.

    modified:
      include/mysql/plugin.h.pp
      include/mysql/service_my_snprintf.h
      include/mysql/service_thd_alloc.h
=== modified file 'Makefile.am'
--- a/Makefile.am	2010-07-20 17:54:05 +0000
+++ b/Makefile.am	2010-07-20 19:53:39 +0000
@@ -63,7 +63,7 @@ dist-hook:
 	test ! -f $(top_srcdir)/configure.am  || \
 	$(INSTALL_DATA)  $(top_srcdir)/configure.am $(distdir)
 
-all-local:		@ABI_CHECK@	
+all-local:		@ABI_CHECK@
 
 tags:
 	support-files/build-tags

=== modified file 'cmake/abi_check.cmake'
--- a/cmake/abi_check.cmake	2010-04-20 22:29:30 +0000
+++ b/cmake/abi_check.cmake	2010-07-20 19:53:39 +0000
@@ -38,7 +38,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYS
     -DCOMPILER=${COMPILER}
     -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
     -DBINARY_DIR=${CMAKE_BINARY_DIR}
-    "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
+    "-DDMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
     -P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake
     VERBATIM
   )
@@ -48,7 +48,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYS
     -DCMAKE_C_COMPILER=${COMPILER} 
     -DCMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
     -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}
-    "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
+    "-DMYSQL_ABI_CHECK -DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
     -P ${CMAKE_SOURCE_DIR}/cmake/scripts/do_abi_check.cmake
     VERBATIM
   )


Attachment: [text/bzr-bundle] bzr/[e-mail]