diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-06-14 20:05:31 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-14 20:05:31 +0200 |
commit | 0522307ed1b4aeef16dd94606d0b0f6e974b29a5 (patch) | |
tree | ac9829d5d4b0e676c984b931702282c446e604ea /vio | |
parent | d2ca6d2e7ff028f6abbab52e36530046b3f84a49 (diff) | |
parent | 326b40c9c8160db414288925936449e55f4f3a0a (diff) | |
download | mariadb-git-0522307ed1b4aeef16dd94606d0b0f6e974b29a5.tar.gz |
mysql-5.5 merge
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 8e28e7661a9..baefa1c6d06 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2011, Oracle and/or its affiliates + Copyright (c) 2001, 2012, Oracle and/or its affiliates Copyright (c) 2012, Monty Program Ab This program is free software; you can redistribute it and/or |