summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-06-14 20:05:31 +0200
committerSergei Golubchik <sergii@pisem.net>2012-06-14 20:05:31 +0200
commit0522307ed1b4aeef16dd94606d0b0f6e974b29a5 (patch)
treeac9829d5d4b0e676c984b931702282c446e604ea /sql/item_subselect.cc
parentd2ca6d2e7ff028f6abbab52e36530046b3f84a49 (diff)
parent326b40c9c8160db414288925936449e55f4f3a0a (diff)
downloadmariadb-git-0522307ed1b4aeef16dd94606d0b0f6e974b29a5.tar.gz
mysql-5.5 merge
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 5458a2fb968..4acac68fe6b 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates.
- Copyright (c) 2010, 2011, Monty Program Ab
+/* Copyright (c) 2002, 2012, Oracle and/or its affiliates.
+ Copyright (c) 2010, 2012, 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