diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-16 00:30:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-16 00:30:29 +0200 |
| commit | 1e79138459038c39c85239a825bf1727ef43c156 (patch) | |
| tree | 88f725551c0f061487fde0ee5a6c0ea471b24abc /sql/sql_union.cc | |
| parent | 7aed441963823191e94da3df069e123dc8794eee (diff) | |
| parent | 42f359f9827340bf430a9f1a0bda9b059951ea08 (diff) | |
| download | mariadb-git-1e79138459038c39c85239a825bf1727ef43c156.tar.gz | |
Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1
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 cfc34b0f90a..f4d6bec1353 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 |