summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2011-06-29 14:31:56 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2011-06-29 14:31:56 +0300
commitceb6a125d50f1ff1f0a36e585a6171a974a145f3 (patch)
tree12eaea76d1aa9031a530f9b91d6d2cf0039ee85e /extra
parent64a0a6e1edc9af9cab975de54f747dd0e6094845 (diff)
parentabda61d4de0e6255bacf0cbc4448d5392d8f67cc (diff)
downloadmariadb-git-ceb6a125d50f1ff1f0a36e585a6171a974a145f3.tar.gz
Merge mysql-5.1 -> mysql-5.5
Diffstat (limited to 'extra')
-rw-r--r--extra/innochecksum.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/innochecksum.c b/extra/innochecksum.c
index 9bd4bfcc0cd..6aba399e315 100644
--- a/extra/innochecksum.c
+++ b/extra/innochecksum.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB & Innobase Oy
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
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