diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /client/mysqladmin.cc | |
parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz |
Merge branch '5.5' into 10.0
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 78a73c01218..bab94d6e5ee 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 |