diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 22:26:58 +0100 |
commit | cb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch) | |
tree | 10d38ccf7fe60d5ea5c866d37292833b77dfcdae /sql/filesort.cc | |
parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
parent | faec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff) | |
download | mariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz |
mysql-5.5.37 selective merge
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index c0b121ca779..34cd11cbcf3 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. - Copyright (c) 2009, 2012, Monty Program Ab. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, 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 |