diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-14 13:55:28 +0200 |
| commit | ae29ea2d86cd3fe5b2016baf595744cfb44c52cd (patch) | |
| tree | 6f5017d7d25380d567084842e35015f52724e8d1 /mysys | |
| parent | 1b50d599606244677215fbe7b05be1a891fecf18 (diff) | |
| parent | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (diff) | |
| download | mariadb-git-ae29ea2d86cd3fe5b2016baf595744cfb44c52cd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/errors.c | 4 | ||||
| -rw-r--r-- | mysys/my_write.c | 3 | ||||
| -rw-r--r-- | mysys/tree.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 84b406792af..0f2edbc4ae5 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -1,5 +1,5 @@ -/* - Copyright (c) 2000, 2013, Oracle and/or its affiliates +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, 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 diff --git a/mysys/my_write.c b/mysys/my_write.c index 10a500c3fb3..001f7296042 100644 --- a/mysys/my_write.c +++ b/mysys/my_write.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, 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 diff --git a/mysys/tree.c b/mysys/tree.c index 85770194f25..4184fc4634a 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2010, 2016, 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 |