diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /sql/net_serv.cc | |
parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz |
MySQL-5.5.35 merge
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index e0a0d5b75cf..4b78492c857 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. Copyright (c) 2012, Monty Program Ab This program is free software; you can redistribute it and/or modify |