Commit 81fe1f19 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
parents 7ef9eb1c c12d8015

client/mysqlbinlog.cc

+17 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int port = MYSQL_PORT; 
static const char* sock= 0;

static const char* user = 0;

static char* pass = 0;

static char *charset= 0;



static ulonglong start_position, stop_position;

#define start_position_mot ((my_off_t)start_position)
@@ -481,6 +482,9 @@ static struct my_option my_long_options[] = 
   "Used to reserve file descriptors for usage by this program",

   (gptr*) &open_files_limit, (gptr*) &open_files_limit, 0, GET_ULONG,

   REQUIRED_ARG, MY_NFILE, 8, OS_FILE_LIMIT, 0, 1, 0},

  {"set-charset", OPT_SET_CHARSET,

   "Add 'SET NAMES character_set' to the output.", (gptr*) &charset,

   (gptr*) &charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"short-form", 's', "Just show the queries, no extra info.",

   (gptr*) &short_form, (gptr*) &short_form, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},
@@ -1095,6 +1099,13 @@ int main(int argc, char** argv) 
    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  if (charset)

    fprintf(result_file,

            "\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;"

            "\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;"

            "\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;"  

            "\n/*!40101 SET NAMES %s */;\n", charset);



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1112,6 +1123,12 @@ int main(int argc, char** argv) 
  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");



  if (charset)

    fprintf(result_file,

            "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"

            "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"

            "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");



  if (tmpdir.list)

    free_tmpdir(&tmpdir);

  if (result_file != stdout)

config.guess

+386 −307

File changed.

Preview size limit exceeded, changes collapsed.

config.sub

+177 −51
Original line number Diff line number Diff line 
#! /bin/sh

# Configuration validation subroutine script.

#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.



timestamp='2003-07-04'

timestamp='2005-12-23'



# This file is (in principle) common to ALL GNU software.

# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2003-07-04' 
#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place - Suite 330,

# Boston, MA 02111-1307, USA.



# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA

# 02110-1301, USA.

#

# As a special exception to the GNU General Public License, if you

# distribute this file as part of a program that contains a

# configuration script generated by Autoconf, you may include it under

# the same distribution terms that you use for the rest of that program.





# Please send patches to <config-patches@gnu.org>.  Submit a context

# diff and a properly formatted ChangeLog entry.

#
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patches@gnu.org>." 
version="\

GNU config.sub ($timestamp)



Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

Free Software Foundation, Inc.



This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information." 
while test $# -gt 0 ; do

  case $1 in

    --time-stamp | --time* | -t )

       echo "$timestamp" ; exit 0 ;;

       echo "$timestamp" ; exit ;;

    --version | -v )

       echo "$version" ; exit 0 ;;

       echo "$version" ; exit ;;

    --help | --h* | -h )

       echo "$usage"; exit 0 ;;

       echo "$usage"; exit ;;

    -- )     # Stop option processing

       shift; break ;;

    - )	# Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do 
    *local*)

       # First pass through any local machine types.

       echo $1

       exit 0;;

       exit ;;



    * )

       break ;;
@@ -118,7 +119,9 @@ esac 
# Here we must recognize all the valid KERNEL-OS combinations.

maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`

case $maybe_os in

  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)

  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \

  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \

  storm-chaos* | os2-emx* | rtmk-nova*)

    os=-$maybe_os

    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`

    ;;
@@ -144,7 +147,7 @@ case $os in 
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

	-apple | -axis)

	-apple | -axis | -knuth | -cray)

		os=

		basic_machine=$1

		;;
@@ -169,6 +172,10 @@ case $os in 
	-hiux*)

		os=-hiuxwe2

		;;

	-sco6)

		os=-sco5v6

		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

		;;

	-sco5)

		os=-sco3.2v5

		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +192,10 @@ case $os in 
		# Don't forget version if it is 3.2v4 or newer.

		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

		;;

	-sco5v6*)

		# Don't forget version if it is 3.2v4 or newer.

		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`

		;;

	-sco*)

		os=-sco3.2v2

		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +239,16 @@ case $basic_machine in 
	| a29k \

	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \

	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \

	| am33_2.0 \

	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \

	| bfin \

	| c4x | clipper \

	| d10v | d30v | dlx | dsp16xx \

	| d10v | d30v | dlx | dsp16xx | dvp \

	| fr30 | frv \

	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

	| i370 | i860 | i960 | ia64 \

	| ip2k \

	| m32r | m68000 | m68k | m88k | mcore \

	| ip2k | iq2000 \

	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \

	| mips | mipsbe | mipseb | mipsel | mipsle \

	| mips16 \

	| mips64 | mips64el \
@@ -244,30 +257,37 @@ case $basic_machine in 
	| mips64vr4100 | mips64vr4100el \

	| mips64vr4300 | mips64vr4300el \

	| mips64vr5000 | mips64vr5000el \

	| mips64vr5900 | mips64vr5900el \

	| mipsisa32 | mipsisa32el \

	| mipsisa32r2 | mipsisa32r2el \

	| mipsisa64 | mipsisa64el \

	| mipsisa64r2 | mipsisa64r2el \

	| mipsisa64sb1 | mipsisa64sb1el \

	| mipsisa64sr71k | mipsisa64sr71kel \

	| mipstx39 | mipstx39el \

	| mn10200 | mn10300 \

	| mt \

	| msp430 \

	| ns16k | ns32k \

	| openrisc | or32 \

	| or32 \

	| pdp10 | pdp11 | pj | pjl \

	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \

	| pyramid \

	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

	| sh64 | sh64le \

	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \

	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \

	| sparcv8 | sparcv9 | sparcv9b \

	| strongarm \

	| tahoe | thumb | tic4x | tic80 | tron \

	| v850 | v850e \

	| we32k \

	| x86 | xscale | xstormy16 | xtensa \

	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \

	| z8k)

		basic_machine=$basic_machine-unknown

		;;

	m32c)

		basic_machine=$basic_machine-unknown

		;;

	m6811 | m68hc11 | m6812 | m68hc12)

		# Motorola 68HC11/12.

		basic_machine=$basic_machine-unknown
@@ -275,6 +295,13 @@ case $basic_machine in 
		;;

	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)

		;;

	ms1)

		basic_machine=mt-unknown

		;;

	nios2 | nios2-* | nios2 | nios2-*)

		basic_machine=nios2-altera

		os=-none

		;;



	# We use `pc' rather than `unknown'

	# because (1) that's what they normally are, and
@@ -295,19 +322,19 @@ case $basic_machine in 
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \

	| avr-* \

	| bs2000-* \

	| bfin-* | bs2000-* \

	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

	| clipper-* | cydra-* \

	| clipper-* | craynv-* | cydra-* \

	| d10v-* | d30v-* | dlx-* \

	| elxsi-* \

	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

	| h8300-* | h8500-* \

	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \

	| i*86-* | i860-* | i960-* | ia64-* \

	| ip2k-* \

	| m32r-* \

	| ip2k-* | iq2000-* \

	| m32r-* | m32rle-* \

	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

	| m88110-* | m88k-* | mcore-* \

	| m88110-* | m88k-* | maxq-* | mcore-* \

	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \

	| mips16-* \

	| mips64-* | mips64el-* \
@@ -316,33 +343,40 @@ case $basic_machine in 
	| mips64vr4100-* | mips64vr4100el-* \

	| mips64vr4300-* | mips64vr4300el-* \

	| mips64vr5000-* | mips64vr5000el-* \

	| mips64vr5900-* | mips64vr5900el-* \

	| mipsisa32-* | mipsisa32el-* \

	| mipsisa32r2-* | mipsisa32r2el-* \

	| mipsisa64-* | mipsisa64el-* \

	| mipsisa64r2-* | mipsisa64r2el-* \

	| mipsisa64sb1-* | mipsisa64sb1el-* \

	| mipsisa64sr71k-* | mipsisa64sr71kel-* \

	| mipstx39-* | mipstx39el-* \

	| mmix-* \

	| mt-* \

	| msp430-* \

	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \

	| none-* | np1-* | ns16k-* | ns32k-* \

	| orion-* \

	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

	| pyramid-* \

	| romp-* | rs6000-* \

	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \

	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \

	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \

	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \

	| sparclite-* \

	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \

	| tahoe-* | thumb-* \

	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

	| tron-* \

	| v850-* | v850e-* | vax-* \

	| we32k-* \

	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

	| xtensa-* \

	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \

	| xstormy16-* | xtensa-* \

	| ymp-* \

	| z8k-*)

		;;

	m32c-*)

		;;

	# Recognize the various machine names and aliases which stand

	# for a CPU type and a company and sometimes even an OS.

	386bsd)
@@ -359,6 +393,9 @@ case $basic_machine in 
		basic_machine=a29k-amd

		os=-udi

		;;

    	abacus)

		basic_machine=abacus-unknown

		;;

	adobe68k)

		basic_machine=m68010-adobe

		os=-scout
@@ -376,6 +413,9 @@ case $basic_machine in 
	amd64)

		basic_machine=x86_64-pc

		;;

	amd64-*)

		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`

		;;

	amdahl)

		basic_machine=580-amdahl

		os=-sysv
@@ -435,12 +475,27 @@ case $basic_machine in 
		basic_machine=j90-cray

		os=-unicos

		;;

	craynv)

		basic_machine=craynv-cray

		os=-unicosmp

		;;

	cr16c)

		basic_machine=cr16c-unknown

		os=-elf

		;;

	crds | unos)

		basic_machine=m68k-crds

		;;

	crisv32 | crisv32-* | etraxfs*)

		basic_machine=crisv32-axis

		;;

	cris | cris-* | etrax*)

		basic_machine=cris-axis

		;;

	crx)

		basic_machine=crx-unknown

		os=-elf

		;;

	da30 | da30-*)

		basic_machine=m68k-da30

		;;
@@ -463,6 +518,10 @@ case $basic_machine in 
		basic_machine=m88k-motorola

		os=-sysv3

		;;

	djgpp)

		basic_machine=i586-pc

		os=-msdosdjgpp

		;;

	dpx20 | dpx20-*)

		basic_machine=rs6000-bull

		os=-bosx
@@ -635,16 +694,30 @@ case $basic_machine in 
		basic_machine=m68k-atari

		os=-mint

		;;

	mipsEE* | ee | ps2)

		basic_machine=mips64r5900el-scei

		case $os in

		    -linux*)

			;;

		    *)

			os=-elf

			;;

		esac

		;;

	iop)

		basic_machine=mipsel-scei

		os=-irx

		;;

	dvp)

		basic_machine=dvp-scei

		os=-elf

		;;

	mips3*-*)

		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`

		;;

	mips3*)

		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown

		;;

	mmix*)

		basic_machine=mmix-knuth

		os=-mmixware

		;;

	monitor)

		basic_machine=m68k-rom68k

		os=-coff
@@ -657,6 +730,9 @@ case $basic_machine in 
		basic_machine=i386-pc

		os=-msdos

		;;

	ms1-*)

		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`

		;;

	mvs)

		basic_machine=i370-ibm

		os=-mvs
@@ -725,10 +801,6 @@ case $basic_machine in 
	np1)

		basic_machine=np1-gould

		;;

	nv1)

		basic_machine=nv1-cray

		os=-unicosmp

		;;

	nsr-tandem)

		basic_machine=nsr-tandem

		;;
@@ -736,9 +808,12 @@ case $basic_machine in 
		basic_machine=hppa1.1-oki

		os=-proelf

		;;

	or32 | or32-*)

	openrisc | openrisc-*)

		basic_machine=or32-unknown

		os=-coff

		;;

	os400)

		basic_machine=powerpc-ibm

		os=-os400

		;;

	OSE68000 | ose68000)

		basic_machine=m68000-ericsson
@@ -765,6 +840,12 @@ case $basic_machine in 
	pc532 | pc532-*)

		basic_machine=ns32k-pc532

		;;

	pc98)

		basic_machine=i386-pc

		;;

	pc98-*)

		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`

		;;

	pentium | p5 | k5 | k6 | nexgen | viac3)

		basic_machine=i586-pc

		;;
@@ -821,6 +902,10 @@ case $basic_machine in 
		basic_machine=i586-unknown

		os=-pw32

		;;

	rdos)

		basic_machine=i386-pc

		os=-rdos

		;;

	rom68k)

		basic_machine=m68k-rom68k

		os=-coff
@@ -960,6 +1045,10 @@ case $basic_machine in 
	tower | tower-32)

		basic_machine=m68k-ncr

		;;

	tpf)

		basic_machine=s390x-ibm

		os=-tpf

		;;

	udi29k)

		basic_machine=a29k-amd

		os=-udi
@@ -1003,6 +1092,10 @@ case $basic_machine in 
		basic_machine=hppa1.1-winbond

		os=-proelf

		;;

	xbox)

		basic_machine=i686-pc

		os=-mingw32

		;;

	xps | xps100)

		basic_machine=xps100-honeywell

		;;
@@ -1033,6 +1126,9 @@ case $basic_machine in 
	romp)

		basic_machine=romp-ibm

		;;

	mmix)

		basic_machine=mmix-knuth

		;;

	rs6000)

		basic_machine=rs6000-ibm

		;;
@@ -1049,13 +1145,10 @@ case $basic_machine in 
	we32k)

		basic_machine=we32k-att

		;;

	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)

	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

		basic_machine=sh-unknown

		;;

	sh64)

		basic_machine=sh64-unknown

		;;

	sparc | sparcv9 | sparcv9b)

	sparc | sparcv8 | sparcv9 | sparcv9b)

		basic_machine=sparc-sun

		;;

	cydra)
@@ -1128,19 +1221,22 @@ case $os in 
	      | -aos* \

	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \

	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \

	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \

	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \

	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \

	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \

	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

	      | -chorusos* | -chorusrdb* \

	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \

	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \

	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

	      | -uxpv* | -beos* | -mpeix* | -udk* \

	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \

	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \

	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \

	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)

	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

	      | -skyos* | -haiku* | -rdos* | -irx*)

	# Remember, each alternative MUST END IN *, to match a version number.

		;;

	-qnx*)
@@ -1158,12 +1254,18 @@ case $os in 
		os=`echo $os | sed -e 's|nto|nto-qnx|'`

		;;

	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \

	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \

	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \

	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)

		;;

	-mac*)

		os=`echo $os | sed -e 's|mac|macos|'`

		;;

	-linux-dietlibc)

		os=-linux-dietlibc

		;;

	-linux*)

		os=`echo $os | sed -e 's|linux|linux-gnu|'`

		;;

	-sunos5*)

		os=`echo $os | sed -e 's|sunos5|solaris2|'`

		;;
@@ -1173,6 +1275,9 @@ case $os in 
	-opened*)

		os=-openedition

		;;

        -os400*)

		os=-os400

		;;

	-wince*)

		os=-wince

		;;
@@ -1194,6 +1299,9 @@ case $os in 
	-atheos*)

		os=-atheos

		;;

	-syllable*)

		os=-syllable

		;;

	-386bsd)

		os=-bsd

		;;
@@ -1216,6 +1324,9 @@ case $os in 
	-sinix*)

		os=-sysv4

		;;

        -tpf*)

		os=-tpf

		;;

	-triton*)

		os=-sysv3

		;;
@@ -1252,6 +1363,9 @@ case $os in 
	-kaos*)

		os=-kaos

		;;

	-zvmoe)

		os=-zvmoe

		;;

	-none)

		;;

	*)
@@ -1329,9 +1443,15 @@ case $basic_machine in 
	*-be)

		os=-beos

		;;

	*-haiku)

		os=-haiku

		;;

	*-ibm)

		os=-aix

		;;

    	*-knuth)

		os=-mmixware

		;;

	*-wec)

		os=-proelf

		;;
@@ -1464,9 +1584,15 @@ case $basic_machine in 
			-mvs* | -opened*)

				vendor=ibm

				;;

			-os400*)

				vendor=ibm

				;;

			-ptx*)

				vendor=sequent

				;;

			-tpf*)

				vendor=ibm

				;;

			-vxsim* | -vxworks* | -windiss*)

				vendor=wrs

				;;
@@ -1491,7 +1617,7 @@ case $basic_machine in 
esac



echo $basic_machine$os

exit 0

exit



# Local variables:

# eval: (add-hook 'write-file-hooks 'time-stamp)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.20)

AM_INIT_AUTOMAKE(mysql, 4.1.21)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=20

NDB_VERSION_BUILD=21

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

ltmain.sh

+1372 −698

File changed.

Preview size limit exceeded, changes collapsed.