diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-18 14:59:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-18 14:59:10 +0200 |
| commit | 9a5fe1f4ea53f26690bfe2cd4f42050bfccaf4af (patch) | |
| tree | 5456add57977533b445a03d2e03e87ffa7f483d8 /include | |
| parent | e7fd6ed3875bd91dbd30a62291ae471c35da8fdf (diff) | |
| parent | 34cd74e52185de2ea3156e8295de3c638cde8c88 (diff) | |
| download | mariadb-git-9a5fe1f4ea53f26690bfe2cd4f42050bfccaf4af.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 1 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 42e3c1ad0c8..cf140cf54ce 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,5 +1,6 @@ /* Copyright (c) 2001, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2017, 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/include/my_sys.h b/include/my_sys.h index 27940683dad..cd74fdf427b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, Monty Program Ab. + Copyright (c) 2010, 2017, 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 |