Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302

ndb/include/util/NdbSqlUtil.hpp

@@ -17,7 +17,6 @@
 #ifndef NDB_SQL_UTIL_HPP
 #define NDB_SQL_UTIL_HPP
 
-#include <string.h>
 #include <ndb_global.h>
 #include <kernel/ndb_limits.h>
 

support-files/mysql.spec.sh

 %define mysql_version		@VERSION@
+%ifarch i386
 %define release 0
+%else
+%define release 0.glibc23
+%endif
 %define mysqld_user		mysql
 %define server_suffix -standard
 
@@ -77,9 +81,8 @@ The MySQL web site (http://www.mysql.com/) provides the latest
 news and information about the MySQL software. Also please see the
 documentation and the manual for more information.
 
-This package includes the MySQL server binary (statically linked,
-compiled with InnoDB support) as well as related utilities to run
-and administrate a MySQL server.
+This package includes the MySQL server binary (incl. InnoDB) as well
+as related utilities to run and administrate a MySQL server.
 
 If you want to access and work with the database, you have to install
 package "MySQL-client" as well!
@@ -189,9 +192,6 @@ client/server version.
 %setup -n mysql-%{mysql_version}
 
 %build
-# The all-static flag is to make the RPM work on different
-# distributions. This version tries to put shared mysqlclient libraries
-# in a separate package.
 
 BuildMySQL() {
 # The --enable-assembler simply does nothing on systems that does not
@@ -306,15 +306,17 @@ mv Docs/manual.ps Docs/manual.ps.save
 make clean
 mv Docs/manual.ps.save Docs/manual.ps
 
-# RPM:s destroys Makefile.in files, so we generate them here
-# aclocal; autoheader; aclocal; automake; autoconf
-# (cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
-
-# Now build the statically linked 4.0 binary (which includes InnoDB)
+#
+# Only link statically on our i386 build host (which has a specially
+# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
+# so don't link statically there
+#
 BuildMySQL "--disable-shared \
+%ifarch i386
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
+%endif
 		--with-server-suffix='%{server_suffix}' \
 		--without-embedded-server \
 		--without-berkeley-db \
@@ -594,6 +596,11 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself
 %changelog 
+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
+
+- do not link statically on IA64/AMD64 as these systems do not have
+  a patched glibc installed
+
 * Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
 
 - Added libmygcc.a to the devel subpackage (required to link applications
@@ -603,10 +610,6 @@ fi
 
 - Added EXCEPTIONS-CLIENT to the "devel" package
 
-* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added ncurses-devel to the build prerequisites (BUG 3377)
-
 * Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
 
 - disabled OpenSSL in the Max binaries again (the RPM packages were the
@@ -622,6 +625,10 @@ fi
 - added mysql_tzinfo_to_sql to the server subpackage
 - run "make clean" instead of "make distclean"
 
+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added ncurses-devel to the build prerequisites (BUG 3377)
+
 * Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
 
 - when using gcc, _always_ use CXX=gcc