diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
| commit | 87e3e67f434628768b5125fbab7e8862fa60da1a (patch) | |
| tree | df19b8bcac9988d83270ed1da05f765bfc4e8624 /client/mysqladmin.cc | |
| parent | 80da57cc4f0c717ee3e01ac5abccc859b88a2fbf (diff) | |
| parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
| download | mariadb-git-87e3e67f434628768b5125fbab7e8862fa60da1a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 0089e03ac93..91e0b9fb405 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2010, 2016, 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 |