From: Davi Arnaut
Date: July 20 2010 7:53pm
Subject: bzr commit into mysql-trunk-merge branch (davi:3138) Bug#52514
List-Archive: http://lists.mysql.com/commits/113987
X-Bug: 52514
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0331145713178994564=="

--===============0331145713178994564==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# At a local mysql-trunk-merge repository of davi

 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
=== 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
   )


--===============0331145713178994564==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/davi.arnaut@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: davi.arnaut@stripped
# target_branch: file:///home/davi/bzr/stage/mysql-trunk-merge/
# testament_sha1: 33ae4626b72e4f5146afa032c6079cd6fb0cf907
# timestamp: 2010-07-20 16:53:44 -0300
# source_branch: file:///home/davi/bzr/bugs/45288-5.1/
# base_revision_id: davi.arnaut@stripped\
#   n2ric6nn303vuv8p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRxj6d0AAjPfgFCwXGP/937u
+CC////6UATPTjt3XLdIa6N1Q4SUII0A0wQxJmlPTU2iPRpHqHqemp6hpo9QSkTRqPQNGhEG1NGh
oBoADQAAEkhoQBQymwoaBsoANADQaBtQOYAjBMQDAJgmjIaGATBGJhJIRPEJpoaaU9qYSDanqaGQ
aAaAGgfMSwNKIZZMxdKW8snDyIacp8qmrG+7JW/OhVkr0Dnmxue+8E4MnI7LzsKhhmGY7feL7wix
myuHnazh7Og1rH8cNFPTc/Ba9HHNvt3Y4sZ+rrTcxK/cmfb1KZNGl/E9XPpOb2w3J5iR0Yadddwv
1X05CcaoSYZg6YLIpCyxQGi0r5gd2mDyuyWaFYsIoUOvI0vfMjbZMXfYTHl2KLkNo4lQiuVkJySg
hMSuqnH5GtsJCVQZSmMnCS3WF9JYrACnGQh0OatFUl4GOh1ym7VcVXHKNznTZaH9WEYCxnw7A2PW
r274SDUQsMbCcvSwWXUp9eoE8udl1iYgKgTclN+pSxx5bijpzMt4IZCh5FoenObOb1JVuWUhJ1Ao
qwDIpuKKSruiBZwM9w9ivGau7HZxMrXnDRHMIEIGKfioYcz3K8yJ1i5YWoaOlXRtIke6wDDNottj
Ba6PZQBcc+laQruK6achcRHJpXmGEbsYDZU3kmpxVlbnrLmvfXUFBGSlTc0SXk4woBJB9OPUVhFk
pCD2PCUrykMsHYG2qSotiFlJNJZltN+vDcp1NSXATMqYhNye816oAbCgaF0CefMcRrvMabl5sFXn
zq0it1mMnQ0trRMoJpMDTaSqicLMG5bKgjItQ1rD1Ne4l+HziQp73suHI9A6kcDI2MTGb7JPz+/7
/ovBw3qgXwK/gLmDrHC4wtCAb0v4QDrU1rqbDEsMiKsCBmMTJHBROC4LqFMY6cgkpsY0VX3cG8aL
zPEZ39p5d443vdcmbaz04oVkcbkeCMrDDN7+SoKLU5NfSgQoghEuBqlQua2Ykt5TlVNVW9eb5DxP
pE4acVKEt43NPHEZgL3BX564vqZ1CTEIzt6UcnWiG5b92HYDdcrAfahMdp7WAE7uyGaniU4SctvE
CzZnCoGsIIxMJByKkw7+6cT13VQrAqOCmL+b2g5mfn37TSxwMEFl2CaWceeisq+J4Gm0Z2NvFtDx
NjFmZw0qwQS3PFmVk+1i9CXIpBdkLM9GS+qOxUjkKElAiQ/IqMR4QDoYjTsbCZlgWslWw1E2Rq7L
AGdzXPa7GIodtKiskkNCllVjaxMK42ohJBRSsQoC2GBGCeXahkFKoykjEnjJksRh/1MrpkY0aLo4
19QNMZqNhgyG3gYI/Sk2IVIe4KKTYKKEwPM2quNlPG9FvQqJnRAyWhyMLjko8lCXa1yjK1vRYs1F
ULhLw1SQ4DPS+BGZidCnukKLBIcn7jhqyjtIBNHc9I5ss6kK1EFzQWnDXRZ6mGB9A62qmsjsLp2X
z6AOKsNFeLZFiA4QVwSrnurUTrXPEkuuaFO+l0aYDJ3S8twAhlZrWJGKGMgbY9Xoa8mpI5m6bu9d
TthBCccQr0gOt1h32jPhYQJImF78lMAv3OLzWB6cdkK5Fw6oS5K7SnnPYoeWAlgjktD1n8lCl1E7
mIJQPHpoRpcKsJhc7Evidb/HYf4u5IpwoSA4x9O6


--===============0331145713178994564==--