Commit c56612d3 authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0/ 

into hynda.mysql.fi:/home/my/bk/mysql-4.0-quick-fixes
parents dcbe2415 609d7520

config.guess

+9 −0
Original line number Diff line number Diff line
@@ -563,6 +563,15 @@ EOF 
    F301:UNIX_System_V:*:*)

       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`

       exit 0 ;;

    *:procnto*:*:* | *:QNX:[0123456789]*:*)

       if test "${UNAME_MACHINE}" = "c86pc"; then

         UNAME_MACHINE=pc

       fi

       echo `uname -p`-${UNAME_MACHINE}-nto-qnx

       exit 0;;

    *:QNX:*:*)

       echo i386-pc-qnx

       exit 0;;

    hp3[0-9][05]:NetBSD:*:*)

	echo m68k-hp-netbsd${UNAME_RELEASE}

	exit 0 ;;

config.sub

+15 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ esac 
# Here we must recognize all the valid KERNEL-OS combinations.

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

case $maybe_os in

  linux-gnu*)

  nto-qnx* | linux-gnu*)

    os=-$maybe_os

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

    ;;
@@ -636,6 +636,20 @@ case $basic_machine in 
		basic_machine=i960-intel

		os=-nindy

		;;

	ntox86)

		basic_machine=i386${os:--unknown}

		os=-nto-qnx

		;;

	nto*le | not*be)

		basic_machine=${basic_machine%%be}

		basic_machine=${basic_machine%%le}

		basic_machine=${basic_machine##nto}${os:--unknown}

		os=-nto-qnx

		;;

	nto*)

		basic_machine=${basic_machine##nto}${os:--unknown}

		os=-nto-qnx

		;;

	mon960)

		basic_machine=i960-intel

		os=-mon960

include/m_ctype.h

+18 −18
Original line number Diff line number Diff line
@@ -91,10 +91,10 @@ extern const char *compiled_charset_name(uint charset_number); 


#define	_U	01	/* Upper case */

#define	_L	02	/* Lower case */

#define	_N	04	/* Numeral (digit) */

#define	_S	010	/* Spacing character */

#define	_P	020	/* Punctuation */

#define	_C	040	/* Control character */

#define	_NMR	04	/* Numeral (digit) */

#define	_SPC	010	/* Spacing character */

#define	_PNT	020	/* Punctuation */

#define	_CTR	040	/* Control character */

#define	_B	0100	/* Blank */

#define	_X	0200	/* heXadecimal digit */
@@ -111,14 +111,14 @@ extern const char *compiled_charset_name(uint charset_number); 
#define	isalpha(c)	((my_ctype+1)[(uchar) (c)] & (_U | _L))

#define	isupper(c)	((my_ctype+1)[(uchar) (c)] & _U)

#define	islower(c)	((my_ctype+1)[(uchar) (c)] & _L)

#define	isdigit(c)	((my_ctype+1)[(uchar) (c)] & _N)

#define	isdigit(c)	((my_ctype+1)[(uchar) (c)] & _NMR)

#define	isxdigit(c)	((my_ctype+1)[(uchar) (c)] & _X)

#define	isalnum(c)	((my_ctype+1)[(uchar) (c)] & (_U | _L | _N))

#define	isspace(c)	((my_ctype+1)[(uchar) (c)] & _S)

#define	ispunct(c)	((my_ctype+1)[(uchar) (c)] & _P)

#define	isprint(c)	((my_ctype+1)[(uchar) (c)] & (_P | _U | _L | _N | _B))

#define	isgraph(c)	((my_ctype+1)[(uchar) (c)] & (_P | _U | _L | _N))

#define	iscntrl(c)	((my_ctype+1)[(uchar) (c)] & _C)

#define	isalnum(c)	((my_ctype+1)[(uchar) (c)] & (_U | _L | _NMR))

#define	isspace(c)	((my_ctype+1)[(uchar) (c)] & _SPC)

#define	ispunct(c)	((my_ctype+1)[(uchar) (c)] & _PNT)

#define	isprint(c)	((my_ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR | _B))

#define	isgraph(c)	((my_ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR))

#define	iscntrl(c)	((my_ctype+1)[(uchar) (c)] & _CTR)

#define	isascii(c)	(!((c) & ~0177))

#define	toascii(c)	((c) & 0177)
@@ -129,14 +129,14 @@ extern const char *compiled_charset_name(uint charset_number); 
#define	my_isalpha(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L))

#define	my_isupper(s, c)  (((s)->ctype+1)[(uchar) (c)] & _U)

#define	my_islower(s, c)  (((s)->ctype+1)[(uchar) (c)] & _L)

#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _N)

#define	my_isdigit(s, c)  (((s)->ctype+1)[(uchar) (c)] & _NMR)

#define	my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _X)

#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L | _N))

#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _S)

#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _P)

#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_P | _U | _L | _N | _B))

#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_P | _U | _L | _N))

#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _C)

#define	my_isalnum(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_U | _L | _NMR))

#define	my_isspace(s, c)  (((s)->ctype+1)[(uchar) (c)] & _SPC)

#define	my_ispunct(s, c)  (((s)->ctype+1)[(uchar) (c)] & _PNT)

#define	my_isprint(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR | _B))

#define	my_isgraph(s, c)  (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR))

#define	my_iscntrl(s, c)  (((s)->ctype+1)[(uchar) (c)] & _CTR)



#define use_strcoll(s)                ((s)->strcoll != NULL)

#define MY_STRXFRM_MULTIPLY           (default_charset_info->strxfrm_multiply)

include/my_global.h

+8 −0
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ 
/* #define _AIX32_CURSES */	/* XXX: this breaks AIX 4.3.3 (others?). */

#endif



#ifdef __QNXNTO__

#define HAVE_ERRNO_AS_DEFINE

#define HAVE_FCNTL_LOCK

#undef  HAVE_SYS_UN_H

#undef  HAVE_FINITE

#undef  HAVE_RINT

#endif



#ifdef HAVE_BROKEN_SNPRINTF	/* HPUX 10.20 don't have this defined */

#undef HAVE_SNPRINTF

#endif

readline/vi_mode.c

+4 −0
Original line number Diff line number Diff line
@@ -136,7 +136,11 @@ static int rl_digit_loop1 (); 
void

_rl_vi_initialize_line ()

{

#ifndef __QNXNTO__

  register uint i;

#else

  register unsigned int i;

#endif



  for (i = 0; i < (int) sizeof (vi_mark_chars) / sizeof (int); i++)

    vi_mark_chars[i] = -1;