summaryrefslogtreecommitdiff
path: root/innobase/data/Makefile.am
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-11 09:43:44 -0500
committercmiller@zippy.cornsilk.net <>2007-01-11 09:43:44 -0500
commit896e2623eb2c47a0be6ca6eb406f040ce129ef93 (patch)
tree34d41ad8c284475b2d4ee62fc50423f81db6a9ae /innobase/data/Makefile.am
parent0c181b078684a44dd6d64fa4dcbe9aab1a0d8b78 (diff)
parent49913f2a95d8dcb3ff05160f4c5bf22222bb5f26 (diff)
downloadmariadb-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 'innobase/data/Makefile.am')
-rw-r--r--innobase/data/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/innobase/data/Makefile.am b/innobase/data/Makefile.am
index 445bc35ee63..6f9407d40e5 100644
--- a/innobase/data/Makefile.am
+++ b/innobase/data/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 = libdata.a
libdata_a_SOURCES = data0data.c data0type.c
EXTRA_PROGRAMS =
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%