diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 14:46:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 14:46:28 +0300 |
| commit | 15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9 (patch) | |
| tree | 435451a74686e6c590570a124f2daf80ee1c1d31 /storage/innobase/include | |
| parent | 7a9e1fcd455bfa8e3d71fabb6b76769433567508 (diff) | |
| parent | 1217e4a0c05eff7a394e46e64dffc849c9edda22 (diff) | |
| download | mariadb-git-15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9.tar.gz | |
Merge 5.5 into 10.1
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/data0type.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic index 9d1d6d58b6e..b06a58cd3ab 100644 --- a/storage/innobase/include/data0type.ic +++ b/storage/innobase/include/data0type.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2018, MariaDB Corporation. +Copyright (c) 2017, 2019, 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 the Free Software |