summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@sun.com>2010-12-29 00:47:05 +0100
committerKent Boortz <kent.boortz@sun.com>2010-12-29 00:47:05 +0100
commit920d185fd8551b9737161ee903b2d0bc24dda2f8 (patch)
treef61328771628e2b6b67f40d38e0a493c5ba4e6f7 /sql/net_serv.cc
parentb69b46c77561fd773943738c348c32b8bda5e51e (diff)
parentfddb1f1b1342026bbe39e5ae880c775fc5f189c1 (diff)
downloadmariadb-git-920d185fd8551b9737161ee903b2d0bc24dda2f8.tar.gz
Merge
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index f3f6f1bd9a0..d2d3b1903a2 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