diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
| commit | 6fb17a06016506498f4de75ff754f500f9f674f1 (patch) | |
| tree | d03c86959f150edc0f6f27ca2c06ccbc0e6e5bf0 /sql/sql_union.cc | |
| parent | 2023fac28130d7d3f7d6776332239c62c3890195 (diff) | |
| parent | a4ab2431a20f6e2198d980f8e84fa7118515ca3b (diff) | |
| download | mariadb-git-6fb17a06016506498f4de75ff754f500f9f674f1.tar.gz | |
5.5.39 merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 9d068e464f5..fe8bb7a6620 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. + Copyright (c) 2010, 2014, SkySQL 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 |