diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-17 11:52:41 +0200 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-17 11:52:41 +0200 |
commit | 637c2d9e4e484b999e9dc48545d6b0ae6c9c821f (patch) | |
tree | 04afcc4a59592f5fa900547ba50287c0913b0d40 /sql/filesort.cc | |
parent | 03cdce722749408ab241b79099f8afed2bee9ffa (diff) | |
parent | c21988631be247f9f015c582e80a192bc7b92209 (diff) | |
download | mariadb-git-637c2d9e4e484b999e9dc48545d6b0ae6c9c821f.tar.gz |
merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index ed198549890..e6842cec4a2 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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 |