merged with 3.23 (b5f76be0) · Commits · Software / OSDI20 Artifacts / mariadb

configure.in

+18 −4

Original line number	Diff line number	Diff line
		@@ -629,7 +629,10 @@ struct request_info *req;
		AC_MSG_RESULT(yes)
		AC_DEFINE(LIBWRAP)
		AC_DEFINE(HAVE_LIBWRAP)
		WRAPLIBS="-L$with_libwrap/lib -lwrap",
		if test "$with_libwrap" != "yes"; then
		WRAPLIBS="-L${with_libwrap}/lib"
		fi
		WRAPLIBS="${WRAPLIBS} -lwrap",
		AC_MSG_RESULT(no)
		CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
		CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
		@@ -831,6 +834,12 @@ case $SYSTEM_TYPE in
		echo "Adding fix for interrupted reads"
		CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
		;;
		netbsd)
		echo "Adding flag -Dunix"
		CFLAGS="$CFLAGS -Dunix"
		CXXFLAGS="$CXXFLAGS -Dunix"
		OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
		;;
		bsdi)
		echo "Adding fix for BSDI"
		CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
		@@ -2058,7 +2067,7 @@ and GNU make work together causes some files to depend on this
		header, even if we're not building with Berkeley DB.

		Obviously, if this file is used, it'll break and hopefully we can find
		out why this file was generated by $(top_srcdir)/configure instead of
		out why this file was generated by ${top_srcdir}/configure instead of
		the real db.h.

		If you run into some problems because of this file, please use mysql_bug
		@@ -2099,15 +2108,20 @@ EOF
		AC_DEFINE(HAVE_mit_thread)
		MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
		AC_SUBST(MT_INCLUDES)
		if test -n "$OVERRIDE_MT_LD_ADD"
		then
		MT_LD_ADD="$OVERRIDE_MT_LD_ADD"
		else
		MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
		fi
		AC_SUBST(MT_LD_ADD)
		LIBS="$MT_LD_ADD $LIBS"
		echo ""
		echo "Configuring MIT Pthreads"
		# We will never install so installation paths are not needed.
		(cd mit-pthreads; sh ./configure)
		echo "End of MIT Pthreads configuration"
		echo ""
		LIBS="$MT_LD_ADD $LIBS"
		fi
		fi
		AC_SUBST(sql_server_dirs)

mit-pthreads/gen/ctime.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ time_t altzone = 0;

		static int detzcode(const char * codep)
		{
		long result;
		int result;
		int i;

		result = 0;

mit-pthreads/machdep/netbsd-1.1/__signal.h

+7 −0

Original line number	Diff line number	Diff line
		#include <sys/signal.h>

		__BEGIN_DECLS

		#if NSIG <= 32
		#define __SIGEMPTYSET 0
		#define __SIGFILLSET 0xffffffff
		@@ -8,6 +10,9 @@
		#define __SIGISMEMBER(s, n) ((*(s) & (1 << ((n) - 1))) != 0)

		#else /* XXX Netbsd >= 1.3H */

		int sigaction __P_((int, const struct sigaction , struct sigaction )) __RENAME(__sigaction14);

		#define __SIGEMPTYSET { 0, 0, 0, 0}
		#define __SIGFILLSET { 0xffffffff, 0xffffffff, \
		0xffffffff, 0xffffffff }
		@@ -18,3 +23,5 @@
		#define __SIGISMEMBER(s, n) (((s)->__bits[__SIGWORD(n)] & __SIGMASK(n)) != 0)

		#endif

		__END_DECLS

mit-pthreads/stdio/strerror.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -36,13 +36,18 @@ static char sccsid[] = "@(#)strerror.c 5.6 (Berkeley) 5/4/91";
		#endif /* LIBC_SCCS and not lint */

		#include <string.h>
		#if defined(__NetBSD__)
		#include <errno.h>
		#endif

		char *
		strerror(num)
		int num;
		{
		#if !defined(__NetBSD__)
		extern int sys_nerr;
		extern char *sys_errlist[];
		#endif
		#define UPREFIX "Unknown error: "
		static char ebuf[40] = UPREFIX; /* 64-bit number + slop */
		register unsigned int errnum;
		@@ -51,7 +56,7 @@ strerror(num)

		errnum = num; /* convert to unsigned */
		if (errnum < sys_nerr)
		return(sys_errlist[errnum]);
		return((char *)sys_errlist[errnum]);

		/* Do this by hand, so we don't include stdio(3). */
		t = tmp;

myisam/mi_check.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -434,9 +434,9 @@ int chk_key(MI_CHECK param, register MI_INFO info)
		}
		else
		full_text_keys++;
		/* Check that auto_increment key is bigger than max key value */
		if ((uint) share->base.auto_key -1 == key)
		{
		/* Check that auto_increment key is bigger than max key value */
		ulonglong save_auto_value=info->s->state.auto_increment;
		info->s->state.auto_increment=0;
		info->lastinx=key;
		@@ -456,6 +456,20 @@ int chk_key(MI_CHECK param, register MI_INFO info)
		}
		else
		info->s->state.auto_increment=save_auto_value;

		/* Check that there isn't a row with auto_increment = 0 in the table */
		mi_extra(info,HA_EXTRA_KEYREAD);
		bzero(info->lastkey,keyinfo->seg->length);
		if (!mi_rkey(info, info->rec_buff, key, info->lastkey,
		keyinfo->seg->length, HA_READ_KEY_EXACT))
		{
		/* Don't count this as a real warning, as myisamchk can't correct it */
		uint save=param->warning_printed;
		mi_check_print_warning(param,
		"Found row where the auto_increment column has the value 0");
		param->warning_printed=save;
		}
		mi_extra(info,HA_EXTRA_NO_KEYREAD);
		}

		length=(my_off_t) isam_key_length(info,keyinfo)keys + param->key_blocks2;