diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
| commit | da4503e956ee067947e504c6e73052d9d906742c (patch) | |
| tree | a70bbc33f0411ef29c347a570d8253445d8013e4 /sql/item.h | |
| parent | babbf8c6fc6da92cd1b2bb23f04e996f84b0ca1a (diff) | |
| parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
| download | mariadb-git-da4503e956ee067947e504c6e73052d9d906742c.tar.gz | |
Merge branch '5.5' into 10.0
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 f363950b9bc..d6b505b67b8 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, 2016, MariaDB +/* 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 |