summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-11 19:28:05 +0200
commit24e452a208adebedce6a8a418265fced66bfb027 (patch)
tree83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /sql/sql_select.h
parent8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff)
parent148587461954b544355bc808a89bfed1a70694e1 (diff)
downloadmariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index e24cab714fd..488cc17da98 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -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