merge

time gmake -j 2 distcheck \

 EXTRA_CONF_ARGS="--with-unix-socket-path=/var/tmp/mysql.sock --with-low-memory $EXTRA_CONFIG"

sh $BD/Build-tools/Do-rpm

sh $BD/Build-tools/Do-rpm $*

rm -f $TMP_SCRIPT

END

$opt_help=$opt_Information=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0;

$opt_innodb=$opt_bdb=0;

GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s") || usage();

GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip","version-suffix=s", "with-other-libc=s") || usage();

usage() if ($opt_help || $opt_Information);

usage() if (!$opt_distribution);

  {

    $opt_config_options.=" --with-client-ldflags=-all-static";

  }

  if ($opt_with_other_libc)

  {

    $opt_with_other_libc = "--with-other-libc=$opt_with_other_libc";    

  }

  if (!$opt_enable_shared)

  {

    $opt_config_options.= " --disable-shared"; # Default for binary versions

#! /bin/sh

set -e -x

OTHER_LIBC_DIR=/usr/local/mysql-glibc

BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \

  --with-comment="Official MySQL Binary"  \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

  --with-server-suffix=-max

scripts/make_binary_distribution

make dist

Build-tools/Do-rpm --local

BUILD/compile-pentium --with-other-libc=$OTHER_LIBC_DIR \

  --with-comment="Official MySQL Binary" \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile

scripts/make_binary_distribution 

# Hard path!!

bpath=`/bin/pwd`

rpmdir="/usr/src/redhat"

for d in /usr/src/redhat /usr/src/packages ; do

if test -d "$d"

then

  rpmdir=$d

fi  

done

if test -z "$rpmdir"

then

 echo "Could not find suitable rpmdir on this system"

 exit 1

fi

logdir="$bpath/Logs"

###### Perl STUFF #####

diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/internals.h ./linuxthreads/internals.h

--- ../glibc-2.2.5/linuxthreads/internals.h	Thu Nov 29 00:44:16 2001

+++ ./linuxthreads/internals.h	Fri Feb 22 21:18:09 2002

@@ -343,7 +343,7 @@

    THREAD_SELF implementation is used, this must be a power of two and

    a multiple of PAGE_SIZE.  */

 #ifndef STACK_SIZE

-#define STACK_SIZE  (2 * 1024 * 1024)

+#define STACK_SIZE  (128 * 1024)

 #endif

 /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */

diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h

--- ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Thu Jun  8 13:49:49 2000

+++ ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Fri Feb 22 21:18:09 2002

@@ -64,7 +64,7 @@

 /* The number of threads per process.  */

 #define _POSIX_THREAD_THREADS_MAX	64

 /* This is the value this implementation supports.  */

-#define PTHREAD_THREADS_MAX	1024

+#define PTHREAD_THREADS_MAX	4096

 /* Maximum amount by which a process can descrease its asynchronous I/O

    priority level.  */

diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/nss/nsswitch.c ./nss/nsswitch.c

--- ../glibc-2.2.5/nss/nsswitch.c	Tue Jul 17 02:21:36 2001

+++ ./nss/nsswitch.c	Fri Feb 22 21:18:09 2002

@@ -515,8 +515,16 @@

 					     + (line - name + 1));

       if (new_service == NULL)

 	return result;

-

+#ifdef DO_STATIC_NSS

+      if (strncmp(name,"files",5) == 0 ||

+	  strncmp(name,"dns",3) == 0)

+#endif      

       *((char *) __mempcpy (new_service->name, name, line - name)) = '\0';

+#ifdef DO_STATIC_NSS

+      else

+        *((char *) __mempcpy (new_service->name, "files", 5)) = '\0';

+#endif      

+	

       /* Set default actions.  */

       new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;

diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/time/Makefile ./time/Makefile

--- ../glibc-2.2.5/time/Makefile	Fri Feb 22 21:27:19 2002

+++ ./time/Makefile	Fri Feb 22 21:26:47 2002

@@ -37,8 +37,8 @@

 include ../Rules

-tz-cflags = -DTZDIR='"$(zonedir)"' \

-	    -DTZDEFAULT='"$(localtime-file)"' \

+tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \

+	    -DTZDEFAULT='"/etc/localtime"' \

 	    -DTZDEFRULES='"$(posixrules-file)"'

 CFLAGS-tzfile.c = $(tz-cflags)

diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/timezone/Makefile ./timezone/Makefile

--- ../glibc-2.2.5/timezone/Makefile	Wed Aug 29 16:45:25 2001

+++ ./timezone/Makefile	Fri Feb 22 21:18:09 2002

@@ -159,8 +159,8 @@

 $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o

-tz-cflags = -DTZDIR='"$(zonedir)"' \

-	    -DTZDEFAULT='"$(localtime-file)"' \

+tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \

+	    -DTZDEFAULT='"/etc/localtime"' \

 	    -DTZDEFRULES='"$(posixrules-file)"' \

 	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone