diff options
author | unknown <monty@donna.mysql.com> | 2000-08-18 13:09:26 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-08-18 13:09:26 +0300 |
commit | d000fde588c33896739320df947ccf8cbad4b981 (patch) | |
tree | b47f92fa5b8b69587ec57938ff7a9b322fec6d57 /mysys | |
parent | 340794dd2991246daf964e95067309c3183aa86a (diff) | |
parent | f053a2846ae1479cfe0ca3efd0bb8bddc410f84b (diff) | |
download | mariadb-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 'mysys')
-rw-r--r-- | mysys/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 658b68d6861..6697bfeeae4 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -91,3 +91,6 @@ test_vsnprintf: my_vsnprintf.c $(LIBRARIES) test_hash: test_hash.c $(LIBRARIES) $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) + +# Don't update the files from bitkeeper +%::SCCS/s.% |