diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-27 09:21:19 +0200 |
| commit | 77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch) | |
| tree | 5dcd215abf7afd125ad5744697565121b954c1b2 /sql/net_serv.cc | |
| parent | 677c44f0c37973ad70550d9b807781e688764fae (diff) | |
| parent | d61e5260fb9983ea8dff539b23a6d0a150c2065c (diff) | |
| download | mariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 3e17ced92ba..f52549bfd0b 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2012, 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 |