Commit f399d656 authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt


Makefile.am:
  merge fixes
parents 3e0139d9 93b36e8e

Makefile.am

+6 −0
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ test-force-pl: 
	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



#used by autopush.pl to run memory based tests

test-force-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem



# Don't update the files from bitkeeper

%::SCCS/s.%