diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-08 17:47:33 +0200 |
| commit | 1c32b8ee3c16cce7fbc1152e3d3a4f172a1fa4dc (patch) | |
| tree | ddc6455bd49752f4483b2fbe513bd7eaac760e0a /sql/net_serv.cc | |
| parent | e98c722825dca1949756de87f510f85d8a508df1 (diff) | |
| parent | 94097ecd56380e27002f26677aa88f842f30f5f0 (diff) | |
| download | mariadb-git-1c32b8ee3c16cce7fbc1152e3d3a4f172a1fa4dc.tar.gz | |
weave merge from mysql-5.1 to mysql-5.5
Resolved an innodb conflict thanks to vasil.
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 d60e2051ccd..e2cc32015b1 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2011, 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 |