diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 16:48:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 16:48:56 +0200 |
| commit | ded128aa9b3d40775e626a08a744a93d9ba71b01 (patch) | |
| tree | 2abae3ef8fd5438fc99d269b47d645faec3cb8e8 /storage/innobase/include/univ.i | |
| parent | 64952203af161c6e72744b6a2fb8e0f5274ea4d6 (diff) | |
| parent | 259185764ba949bbe0cfa6bbef4673f61155cb90 (diff) | |
| download | mariadb-git-ded128aa9b3d40775e626a08a744a93d9ba71b01.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include/univ.i')
| -rw-r--r-- | storage/innobase/include/univ.i | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 7ce2a092b9e..531bde31afd 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by |