summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
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
commitd38e7d6676a144f1f41fb15c0f7e9860593e7ccb (patch)
treee55f53ff3cc4b044769ca269561a933e3c93f05f /sql/opt_range.cc
parent3a0d42c6c692f303b372d4effd237ec93779aeaa (diff)
parent1fa37ae427bc351530f7fcfd6050d1b1cdd0167b (diff)
downloadmariadb-git-d38e7d6676a144f1f41fb15c0f7e9860593e7ccb.tar.gz
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index ffeea3dd25f..a42a03f4c86 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates.
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+ Copyright (c) 2008-2011 Monty Program 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