summaryrefslogtreecommitdiff
path: root/sql/sql_map.h
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 /sql/sql_map.h
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 'sql/sql_map.h')
-rw-r--r--sql/sql_map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_map.h b/sql/sql_map.h
index e6dd60eb5aa..d8eb64995aa 100644
--- a/sql/sql_map.h
+++ b/sql/sql_map.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2005 MySQL AB
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