diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
| commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
| tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /sql/sql_acl.cc | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index e5c3340aa09..b3059248ac0 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 2018, 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 |