Changes to get mysqld-max to compile

BUILD/SETUP.sh:
  Changed to use -ffixed-ebp with -fomit-frame-pointer
BUILD/compile-pentium:
  Changed to use reckless flags as defaults as this appears to work
  good, even with stack-traces.
Build-tools/Do-all-build-steps:
  Innobase -> Innodb
Docs/manual.texi:
  Added information about -ffixed-ebp
scripts/safe_mysqld.sh:
  Added option --mysqld-version
  Use mysqld-max binary as default if installed and --mysqld or --mysqld-version
  is not used
support-files/mysql-max.spec.sh:
  Fixed bugs
support-files/mysql.spec.sh:
  Added Max package
tests/fork_big.pl:
  Added --user and --password

2 files changed, 36 insertions, 13 deletions

diff --git a/support-files/mysql-max.spec.sh b/support-files/mysql-max.spec.sh
index 8408b09c6ab..49f131154c0 100644
--- a/support-files/mysql-max.spec.sh
+++ b/support-files/mysql-max.spec.sh
@@ -22,7 +22,7 @@ Obsoletes:	mysql
 
 # Think about what you use here since the first step is to
 # run a rm -rf
-BuildRoot:	/var/tmp/mysql
+BuildRoot:	/var/tmp/mysql-max
 
 # From the manual
 %description
@@ -72,7 +72,7 @@ para maiores informações.
 
 %prep
 %setup -n mysql-max-%{mysql_version}
-# %setup -T -D -a 1 -n mysql-%{mysql_version}
+# %setup -T -D -a 1 -n mysql-max-%{mysql_version}
 
 %build
 # The all-static flag is to make the RPM work on different
@@ -118,7 +118,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
 # Use the build root for temporary storage of the shared libraries.
 
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}
+MBD=$RPM_BUILD_DIR/mysql-max-%{mysql_version}
 if test -z "$RBR" -o "$RBR" = "/"
 then
 	echo "RPM_BUILD_ROOT has stupid value"
@@ -140,7 +140,7 @@ BuildMySQL "--disable-shared" \
 
 %install -n mysql-max-%{mysql_version}
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}
+MBD=$RPM_BUILD_DIR/mysql-max-%{mysql_version}
 # Ensure that needed directories exists
 install -d $RBR/etc/{logrotate.d,rc.d/init.d}
 install -d $RBR/var/lib/mysql/mysql
@@ -157,7 +157,7 @@ install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql
 install -m755 $MBD/support-files/mysql.server $RBR/etc/rc.d/init.d/mysql
 
 # Install docs
-install -m644 $RPM_BUILD_DIR/mysql-%{mysql_version}/Docs/mysql.info \
+install -m644 $RPM_BUILD_DIR/mysql-max-%{mysql_version}/Docs/mysql.info \
  $RBR/usr/info/mysql.info
 for file in README COPYING COPYING.LIB Docs/manual_toc.html Docs/manual.html \
     Docs/manual.txt Docs/manual.texi Docs/manual.ps \
@@ -259,5 +259,5 @@ fi
 
 %changelog 
 
-* 2000-04-01 Monty
+* Fri Apr 13 2001 Monty
   First version of mysql-max.spec.sh based on mysql.spec.sh
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index b3ce83fa8c4..3fd602dd818 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -127,6 +127,17 @@ Group: Applications/Databases
 This package contains the shared libraries (*.so*) which certain
 languages and applications need to dynamically load and use MySQL.
 
+%package Max
+Release: %{release}
+Summary: MySQL - server with Berkeley DB and Innodb support
+Group: Applications/Databases
+Obsoletes: mysql-Max
+
+%description Max
+Extra MySQL server binary to get support extra features like
+transactional tables. To active these features on only have to install
+this package after the server package.
+
 %prep
 %setup -n mysql-%{mysql_version}
 
@@ -160,8 +171,6 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
             --infodir=/usr/info \
             --includedir=/usr/include \
             --mandir=/usr/man \
-	    --without-berkeley-db \
-	    --without-innodb \
 	    --with-comment=\"Official MySQL RPM\";
 	    # Add this for more debugging support
 	    # --with-debug
@@ -185,12 +194,15 @@ fi
 rm -rf $RBR
 mkdir -p $RBR
 
-BuildMySQL "--enable-shared --enable-thread-safe-client --without-server"
+# Build the shared libraries and mysqld-max
+
+BuildMySQL "--enable-shared --enable-thread-safe-client --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'"
 
-# Save everything for debus
-tar cf $RBR/all.tar .
+# Save everything for debug
+# tar cf $RBR/all.tar .
 
-# Save shared libraries
+# Save shared libraries and mysqld-max
+mv sql/mysqld sql/mysqld-max
 (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
 (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)
 
@@ -201,7 +213,8 @@ mv Docs/manual.ps.save Docs/manual.ps
 
 BuildMySQL "--disable-shared" \
 	   "--with-mysqld-ldflags='-all-static'" \
-	   "--with-client-ldflags='-all-static'"
+	   "--with-client-ldflags='-all-static'" \
+	   "--without-berkeley-db --without-innodb"
 
 %install -n mysql-%{mysql_version}
 RBR=$RPM_BUILD_ROOT
@@ -220,6 +233,9 @@ make install DESTDIR=$RBR benchdir_root=/usr/share/
 # Install shared libraries (Disable for architectures that don't support it)
 (cd $RBR/usr/lib; tar xf $RBR/shared-libs.tar)
 
+# install saved mysqld-max
+install -m755 $MBD/sql/mysqld-max $RBR/usr/sbin/mysqld-max
+
 # Install logrotate and autostart
 install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql
 install -m755 $MBD/support-files/mysql.server $RBR/etc/rc.d/init.d/mysql
@@ -370,8 +386,15 @@ fi
 %attr(-, root, root) /usr/share/sql-bench
 %attr(-, root, root) /usr/share/mysql-test
 
+%files Max
+%attr(755, root, root) /usr/sbin/mysqld-max
+
 %changelog 
 
+* Fri Apr 13 2001 Monty
+
+- Added mysqld-max to the distribution
+
 * Tue Jan 2  2001  Monty
 
 - Added mysql-test to the bench package