diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-01-07 15:28:36 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-01-07 15:28:36 +0200 |
| commit | b831c6dbbb29a9dc7dd3e3b7910f5b39e96fe2af (patch) | |
| tree | d885b266e360e44a66cfa97fb5d2166a498eeb78 /sql/net_serv.cc | |
| parent | 1e3a4dc1056ed243fd80dc968ae0e8fa08fbb88c (diff) | |
| parent | a448580d650280ad495f55d358b9b0437f2ceecd (diff) | |
| download | mariadb-git-b831c6dbbb29a9dc7dd3e3b7910f5b39e96fe2af.tar.gz | |
automerge
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 1d1871e27a8..ddd57c8fb9a 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 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 @@ -15,9 +15,9 @@ /* This file is the net layer API for the MySQL client/server protocol, - which is a tightly coupled, proprietary protocol owned by MySQL AB. + which is a tightly coupled, proprietary protocol owned by Oracle. Any re-implementations of this protocol must also be under GPL - unless one has got an license from MySQL AB stating otherwise. + unless one has got an license from Oracle stating otherwise. */ /* |