MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:August 31 2010 2:33pm
Subject:bzr commit into mysql-5.5 branch (alik:3087) Bug#55846
View as plain text  
#At file:///mnt/raid/alik/MySQL/bzr/00.builds/mysql-5.5.6-m3-release/ based on revid:alik@stripped

 3087 Alexander Nozdrin	2010-08-31
      Cherry-picking patch for Bug#55846.
      Original changeset:
      ------------------------------------------------------------
      revno: 3186
      revision-id: davi.arnaut@stripped
      parent: gshchepa@stripped
      committer: Davi Arnaut <davi.arnaut@stripped>
      branch nick: mysql-5.5-merge
      timestamp: Tue 2010-08-31 11:28:22 -0300
      message:
        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/CMakeLists.txt
      include/Makefile.am
      scripts/make_win_bin_dist
=== modified file 'include/CMakeLists.txt'
--- a/include/CMakeLists.txt	2010-08-12 15:19:57 +0000
+++ b/include/CMakeLists.txt	2010-08-31 14:33:19 +0000
@@ -54,6 +54,7 @@ SET(HEADERS 
   keycache.h
   m_ctype.h
   my_attribute.h 
+  my_compiler.h
   ${HEADERS_GEN_CONFIGURE}
 )
 

=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2010-07-23 20:14:35 +0000
+++ b/include/Makefile.am	2010-08-31 14:33:19 +0000
@@ -30,8 +30,9 @@ 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) \
-			$(HEADERS_GEN_MAKE) probes_mysql.h probes_mysql_nodtrace.h
+			m_ctype.h my_attribute.h my_compiler.h \
+			$(HEADERS_GEN_CONFIGURE) $(HEADERS_GEN_MAKE) \
+			probes_mysql.h probes_mysql_nodtrace.h
 
 noinst_HEADERS =	lf.h my_bit.h \
 			heap.h my_bitmap.h my_uctype.h password.h \
@@ -45,7 +46,7 @@ noinst_HEADERS =	lf.h my_bit.h \
 			my_user.h my_atomic.h atomic/nolock.h \
 			atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
-			atomic/solaris.h mysql/innodb_priv.h my_compiler.h
+			atomic/solaris.h mysql/innodb_priv.h
 
 pkgpsiinclude_HEADERS = mysql/psi/psi.h mysql/psi/mysql_thread.h \
 			mysql/psi/mysql_file.h

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2010-07-23 20:14:04 +0000
+++ b/scripts/make_win_bin_dist	2010-08-31 14:33:19 +0000
@@ -260,6 +260,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/alik@sun.com-20100831143319-8an812xfy3om6aho.bundle
Thread
bzr commit into mysql-5.5 branch (alik:3087) Bug#55846Alexander Nozdrin31 Aug