summaryrefslogtreecommitdiff
path: root/myisammrg/Makefile.am
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-18 13:09:26 +0300
committerunknown <monty@donna.mysql.com>2000-08-18 13:09:26 +0300
commitd000fde588c33896739320df947ccf8cbad4b981 (patch)
treeb47f92fa5b8b69587ec57938ff7a9b322fec6d57 /myisammrg/Makefile.am
parent340794dd2991246daf964e95067309c3183aa86a (diff)
parentf053a2846ae1479cfe0ca3efd0bb8bddc410f84b (diff)
downloadmariadb-git-d000fde588c33896739320df947ccf8cbad4b981.tar.gz
Merge
myisammrg/Makefile.am: Auto merged support-files/Makefile.am: Auto merged sql/ha_myisam.cc: Merge against serg's changes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'myisammrg/Makefile.am')
-rw-r--r--myisammrg/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am
index 020cd567ec9..b09d7d70191 100644
--- a/myisammrg/Makefile.am
+++ b/myisammrg/Makefile.am
@@ -30,3 +30,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.%