diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
| commit | befbebcfdb0749fc0167a7652900abae6a0060e7 (patch) | |
| tree | 89185b0d10c5b8c12807ce8fcb41122c9cf5c18e /Makefile.am | |
| parent | e3a9d9493556d159a580d7e266770fcaf38c7343 (diff) | |
| parent | 0fb7649940c849f4df4ceca7d01f5e8946ffbb0d (diff) | |
| download | mariadb-git-befbebcfdb0749fc0167a7652900abae6a0060e7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
client/mysqltest.c:
Auto merged
Makefile.am:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ab9a7a33a44..19d7678e611 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,3 +131,9 @@ 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-pl-mem: + cd mysql-test; \ + ./mysql-test-run.pl --force --mem && \ + ./mysql-test-run.pl --ps-protocol --force --mem + |