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 | 1de59007ecc4ce5e662a7ff1328a11860561d0f8 (patch) | |
| tree | b47f92fa5b8b69587ec57938ff7a9b322fec6d57 /myisammrg | |
| parent | 00e030af79741afa3b81637b7976b7f804f49c46 (diff) | |
| parent | c9abdb239b1b8ab15946f844210eb8521354820d (diff) | |
| download | mariadb-git-1de59007ecc4ce5e662a7ff1328a11860561d0f8.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')
| -rw-r--r-- | myisammrg/Makefile.am | 3 |
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.% |