diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
| commit | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (patch) | |
| tree | 96dad57dc1b9946a3cbec98473b3ec2534a455f2 /sql/net_serv.cc | |
| parent | a53f3c6d3cfa50b15b1aff26bc9479eb582d8611 (diff) | |
| parent | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (diff) | |
| download | mariadb-git-23af6f5942e7235a7c14a36cb8dd0d2796b5ef37.tar.gz | |
Merge branch '10.0' of github.com:MariaDB/server 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 |