Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92

into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92


mysql-test/t/ndb_read_multi_range.test:
  Auto merged
configure.in:
  Merged
mysql-test/r/innodb.result:
  Null merge
mysql-test/t/innodb.test:
  Null merge
sql/ha_innodb.cc:
  Null merge
storage/innobase/btr/btr0sea.c:
  Null merge
storage/innobase/dict/dict0dict.c:
  Null merge
storage/innobase/dict/dict0load.c:
  Null merge
storage/innobase/include/buf0buf.h:
  Null merge
storage/innobase/include/dict0dict.h:
  Null merge
storage/innobase/include/dict0load.h:
  Null merge
storage/innobase/include/os0file.h:
  Null merge
storage/innobase/include/rem0cmp.h:
  Null merge
storage/innobase/include/srv0srv.h:
  Null merge
storage/innobase/rem/rem0cmp.c:
  Null merge
storage/innobase/row/row0ins.c:
  Null merge
storage/innobase/row/row0mysql.c:
  Null merge
storage/innobase/srv/srv0srv.c:
  Null merge
storage/innobase/srv/srv0start.c:
  Null merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto-merge
support-files/mysql.spec.sh:
  Auto-merge

configure.in

@@ -14,6 +14,12 @@ DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_VERSION=15:0:0
 
+# ndb version
+NDB_VERSION_MAJOR=5
+NDB_VERSION_MINOR=0
+NDB_VERSION_BUILD=18
+NDB_VERSION_STATUS=""
+
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`

support-files/mysql.spec.sh

@@ -35,7 +35,7 @@ Release:	%{release}
 License:	%{license}
 Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
 URL:		http://www.mysql.com/
-Packager:	Lenz Grimmer <build@mysql.com>
+Packager:	MySQL Production Engineering Team <build@mysql.com>
 Vendor:		MySQL AB
 Provides:	msqlormysql MySQL-server mysql
 BuildRequires: ncurses-devel
@@ -325,7 +325,13 @@ fi
 make test-force || true
 
 # Save mysqld-max
-mv sql/mysqld sql/mysqld-max
+# check if mysqld was installed in .libs/
+if test -f sql/.libs/mysqld
+then
+	cp sql/.libs/mysqld sql/mysqld-max
+else
+	cp sql/mysqld sql/mysqld-max
+fi
 nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
 # Save the perror binary so it supports the NDB error codes (BUG#13740)
 mv extra/perror extra/perror.ndb
@@ -363,14 +369,19 @@ BuildMySQL "--disable-shared \
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
 %else
-		--with-zlib-dir=bundled \
 %endif
+		--with-zlib-dir=bundled \
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--with-archive-storage-engine \
 		--with-innodb \
 		--with-big-tables"
-nm --numeric-sort sql/mysqld > sql/mysqld.sym
+if test -f sql/.libs/mysqld
+then
+	nm --numeric-sort sql/.libs/mysqld > sql/mysqld.sym
+else
+	nm --numeric-sort sql/mysqld > sql/mysqld.sym
+fi
 
 # We might want to save the config log file
 if test -n "$MYSQL_CONFLOG_DEST"
@@ -678,6 +689,8 @@ fi
 %{_libdir}/mysql/libndbclient.a
 %{_libdir}/mysql/libndbclient.la
 %{_libdir}/mysql/libvio.a
+%{_libdir}/mysql/libz.a
+%{_libdir}/mysql/libz.la
 
 %files shared
 %defattr(-, root, root, 0755)
@@ -706,6 +719,13 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Fri Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %packager name to "MySQL Production Engineering Team"
+
 * Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
 
 - Avoid using the "bundled" zlib on "shared" builds: