diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-06 01:00:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-06 01:00:35 +0200 |
| commit | 5c8da505963e1cc1100814912d45dccd5e454ce0 (patch) | |
| tree | e7f7202b93cf18506bd6c17b9a89056f7dba9b12 /Makefile.am | |
| parent | 5bdc88183a9048d71fdb824c3ee204a1fb55ee17 (diff) | |
| parent | 78c5bc62c59b5b168fb0625a70cc465ead4e59ae (diff) | |
| download | mariadb-git-5c8da505963e1cc1100814912d45dccd5e454ce0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Makefile.am:
Manual merge
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index d48f0e24966..d74615b624d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,6 +125,11 @@ test-force-pl: ./mysql-test-run.pl --force && \ ./mysql-test-run.pl --ps-protocol --force +test-force-pl-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.% |