diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /client/mysqladmin.cc | |
parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz |
Merge branch '10.0' 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 d090fe20a01..aa6a188166d 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, 2016, MariaDB + Copyright (c) 2010, 2017, 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 |