diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-01-11 09:43:44 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-01-11 09:43:44 -0500 |
| commit | 896e2623eb2c47a0be6ca6eb406f040ce129ef93 (patch) | |
| tree | 34d41ad8c284475b2d4ee62fc50423f81db6a9ae /Makefile.am | |
| parent | 0c181b078684a44dd6d64fa4dcbe9aab1a0d8b78 (diff) | |
| parent | 49913f2a95d8dcb3ff05160f4c5bf22222bb5f26 (diff) | |
| download | mariadb-git-896e2623eb2c47a0be6ca6eb406f040ce129ef93.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5c6c6c9cfa6..0f3d7405856 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2006 MySQL AB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -122,8 +122,6 @@ tags: # will then calculate the various port numbers it needs from this, # making sure each user use different ports. -test-ps: - cd mysql-test ; \ @PERL@ ./mysql-test-run.pl $(force) --ps-protocol test-ns: @@ -152,3 +150,5 @@ test-force-pl: test-force test-force-pl-mem: test-force-mem test-force-full-pl: test-force-full +# Don't update the files from bitkeeper +%::SCCS/s.% |