Commit 9c1ecff8 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge

parents b231fdef fab1abb4

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ sinisa@work.mysql.com 
tim@localhost.polyesthetic.msg

tim@work.mysql.com

tonu@work.mysql.com

monty@donna.mysql.com

dbug/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -60,3 +60,6 @@ output4.r: $(PROGRAM) 


output5.r:	$(PROGRAM)

		factorial -\#d:f,factorial:F:L:o 3 | cat >$@



# Don't update the files from bitkeeper

%::SCCS/s.%

extra/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -27,3 +27,6 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ 
			prio_queue.h pthread_attr.h pthread_once.h queue.h\

			sleep.h specific.h version.h pwd.h timers.h uio.h \

			cdefs.h machdep.h signal.h __signal.h



# Don't update the files from bitkeeper

%::SCCS/s.%

heap/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -35,3 +35,6 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ 
			prio_queue.h pthread_attr.h pthread_once.h queue.h\

			sleep.h specific.h version.h pwd.h timers.h uio.h \

			cdefs.h machdep.h signal.h __signal.h util.h



# Don't update the files from bitkeeper

%::SCCS/s.%

isam/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -49,3 +49,6 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ 
# Move to automake rules ?

prolint:;	plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \

		"-elib(????)" "+elib(?3??)" my.lnt $(nisam_SOURCES)



# Don't update the files from bitkeeper

%::SCCS/s.%