summaryrefslogtreecommitdiff
path: root/mysys/my_compare.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-21 19:13:14 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-21 19:13:14 +0200
commita8d03ab23519d4afc288a6490676ddb8745e3e72 (patch)
treee55f53ff3cc4b044769ca269561a933e3c93f05f /mysys/my_compare.c
parent04f3ecf632816a940e2838949e0216d638436fd8 (diff)
parent13fefeb04ade34418cd9d99aa93bffb69fdae27e (diff)
downloadmariadb-git-a8d03ab23519d4afc288a6490676ddb8745e3e72.tar.gz
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'mysys/my_compare.c')
-rw-r--r--mysys/my_compare.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_compare.c b/mysys/my_compare.c
index f9f18ae0867..936e10c1433 100644
--- a/mysys/my_compare.c
+++ b/mysys/my_compare.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2006 MySQL AB
+/* Copyright (c) 2011, Oracle and/or its affiliates
Copyright (C) 2009-2011 Monty Program Ab
- Copyright (c) 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