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/mysql.cc | |
| parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
| parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
| download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 4b20e4d98cb..a9310a87d8e 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 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 |