diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:38 +0200 |
| commit | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (patch) | |
| tree | e07ada7fbde72c438f2a6a6c162e050caf1950f9 /mysys | |
| parent | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-37ab7e45963627f3c1ea2dd43d5b305de37bb16f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 917421aa07a..0288c4104b1 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2006, 2014, Oracle and/or its affiliates +# Copyright (c) 2009, 2018, MariaDB Corporation # # 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/mf_iocache2.c b/mysys/mf_iocache2.c index 9e693209445..ca7723cfa09 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 2018, MariaDB Corporation 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 @@ -533,4 +534,3 @@ process_flags: err: return (size_t) -1; } - |