summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-07-25 00:41:54 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-07-25 00:41:54 +0300
commit786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch)
tree8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /sql/net_serv.cc
parent2ce3f95151a424f950be40140c45b0ba583e07ab (diff)
parentc8a0244e957bc4beff453f09c881bb51752d682c (diff)
downloadmariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
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 f52549bfd0b..90a5da6a927 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
- Copyright (c) 2012, 2016, MariaDB
+ Copyright (c) 2012, 2017, MariaDB Corporation
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