diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-12-31 01:04:07 +0100 |
| commit | 27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99 (patch) | |
| tree | ccace61b3d37f7480a06ecda03b0cfc451f58474 /innobase/read/Makefile.am | |
| parent | cc5abe68ebb398434db7896defacf858d2ccbe3c (diff) | |
| parent | e2765a84b174af95f1b507c7e30e136301de5bd3 (diff) | |
| download | mariadb-git-27ecbeecdc0a064d0ff5ea88abe01e786fcc5b99.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.0
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/rt_split.c:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'innobase/read/Makefile.am')
| -rw-r--r-- | innobase/read/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/innobase/read/Makefile.am b/innobase/read/Makefile.am index 982c4abf46d..1e56a9716c3 100644 --- a/innobase/read/Makefile.am +++ b/innobase/read/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# & Innobase Oy +# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy # # 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 @@ -21,3 +20,6 @@ noinst_LIBRARIES = libread.a libread_a_SOURCES = read0read.c EXTRA_PROGRAMS = + +# Don't update the files from bitkeeper +%::SCCS/s.% |