diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
| commit | e0a1c745ec3ed1ec6c0375a2a624697c29f480a6 (patch) | |
| tree | 24ded2c6ebe3ea3413ce56af89ea0f2f63bb3a39 /sql/item.h | |
| parent | 4ec88ea9c3ec52d996b39167d12a61ab95fdeacc (diff) | |
| parent | 2aa51f528fd5d23cc54eca8fbd07e88e7b2993c7 (diff) | |
| download | mariadb-git-e0a1c745ec3ed1ec6c0375a2a624697c29f480a6.tar.gz | |
Merge branch '10.1' into 10.2
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 76708fb3570..9b94a08c34e 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 |