diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
commit | d61d6146438377f393a80b674a4cb6dd639b6a75 (patch) | |
tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /sql/opt_sum.cc | |
parent | 435c9b7d7cdd15102f0f5eddf51e37b3b3b09a27 (diff) | |
parent | 3604b340e57ab54ccfab5187560e1d7f7eda0453 (diff) | |
download | mariadb-git-d61d6146438377f393a80b674a4cb6dd639b6a75.tar.gz |
mysql-5.5.18 merge
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r-- | sql/opt_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 3aefa7c99d1..bcc8a42efc6 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.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) 2010, 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 |