diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 14:08:36 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 14:08:36 +0100 |
commit | 01628ce35a241c2bd1a3c2954ee09b6dda961a74 (patch) | |
tree | e1c5297396d7bf9a5f6547e8393caa8abc8355dc /sql/sql_select.cc | |
parent | ea0c3fc87b6964db63f328b1567a06f21042c5d1 (diff) | |
parent | afce5415de6e1230e3ebca60b0584f36fb04fecc (diff) | |
download | mariadb-git-01628ce35a241c2bd1a3c2954ee09b6dda961a74.tar.gz |
Merge branch 'bb-5.5-serg' into 5.5
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a9b86b5e76b..c960ff37dd9 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015 Oracle and/or its affiliates. - Copyright (c) 2009, 2015 MariaDB + Copyright (c) 2009, 2016 MariaDB 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 |