diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
| commit | 003cb2f42477772ae43228c0bc0f8492246b9340 (patch) | |
| tree | 680314d232d55b5a41dc2b2f5b500677e4aff183 /sql/item.h | |
| parent | 84ed288f6807a4602e0af8615bfb17080df15160 (diff) | |
| parent | 58e0dcb93dc2b2bf49f76c754bd216dbdf875a0d (diff) | |
| download | mariadb-git-003cb2f42477772ae43228c0bc0f8492246b9340.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index b9f8004278d..c128251dae9 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1,8 +1,8 @@ #ifndef SQL_ITEM_INCLUDED #define SQL_ITEM_INCLUDED -/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB Corporation. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. + Copyright (c) 2009, 2017, 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 |