bzr commit into mysql-5.1-bugteam branch (davi:3489) Bug#55846

[Davi Arnaut]

# At a local mysql-5.1-bugteam repository of davi

 3489 Davi Arnaut	2010-08-24
      Bug#55846: Link tests fail on Windows - my_compiler.h missing
      
      Make the my_compiler.h header, like my_attribute.h, part of
      the distribution. This is required due to the dependency of
      the former on the latter (which can undefine __attribute__).

    modified:
      include/Makefile.am
      scripts/make_win_bin_dist
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2010-07-14 12:27:13 +0000
+++ b/include/Makefile.am	2010-08-24 13:48:45 +0000
@@ -26,7 +26,8 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_d
 			decimal.h errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+			m_ctype.h my_attribute.h my_compiler.h \
+			$(HEADERS_GEN_CONFIGURE) \
 			$(HEADERS_GEN_MAKE)
 
 noinst_HEADERS =	config-win.h config-netware.h my_bit.h \
@@ -37,7 +38,7 @@ noinst_HEADERS =	config-win.h config-net
 			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
 			my_handler.h my_time.h my_vle.h my_user.h \
-			my_libwrap.h my_stacktrace.h my_compiler.h
+			my_libwrap.h my_stacktrace.h
 
 EXTRA_DIST =        mysql.h.pp mysql/plugin.h.pp
 

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2009-11-17 16:53:45 +0000
+++ b/scripts/make_win_bin_dist	2010-08-24 13:48:45 +0000
@@ -263,6 +263,7 @@ cp include/mysql.h \
    include/keycache.h \
    include/m_ctype.h \
    include/my_attribute.h \
+   include/my_compiler.h \
    include/mysqld_error.h \
    include/sql_state.h \
    include/mysqld_ername.h \


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