Commit 0118dc7d authored by jcole@tetra.spaceapes.com's avatar jcole@tetra.spaceapes.com
Browse files

Merge jcole@work.mysql.com:/home/bk/mysql 

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
parents e6b5cfa7 74ebbd6c

include/global.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#endif



/* In Linux-ia64 including atomic.h will give us an error */

#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)

#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)) || !defined(THREAD)

#undef HAVE_ATOMIC_ADD

#undef HAVE_ATOMIC_SUB

#endif

strings/Makefile.am

+1 −3
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ 
			cdefs.h machdep.h signal.h __signal.h util.h



libmystrings_a_LIBADD=	@CHARSET_OBJS@

ctype.c:		ctype_extra_sources.c

#we need a dummy rule to make GNUMake get along with bitkeeper

	echo '' >/dev/null

ctype.o:		ctype_extra_sources.c



ctype_extra_sources.c: conf_to_src

	./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \