summaryrefslogtreecommitdiff
path: root/extra/yassl/src/buffer.cpp
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-21 19:13:14 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-21 19:13:14 +0200
commitd38e7d6676a144f1f41fb15c0f7e9860593e7ccb (patch)
treee55f53ff3cc4b044769ca269561a933e3c93f05f /extra/yassl/src/buffer.cpp
parent3a0d42c6c692f303b372d4effd237ec93779aeaa (diff)
parent1fa37ae427bc351530f7fcfd6050d1b1cdd0167b (diff)
downloadmariadb-git-d38e7d6676a144f1f41fb15c0f7e9860593e7ccb.tar.gz
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
Fixed up copyright messages.
Diffstat (limited to 'extra/yassl/src/buffer.cpp')
-rw-r--r--extra/yassl/src/buffer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp
index 5bd69905772..e1583fc96bb 100644
--- a/extra/yassl/src/buffer.cpp
+++ b/extra/yassl/src/buffer.cpp
@@ -1,5 +1,6 @@
/*
- Copyright (C) 2000-2007 MySQL AB
+ Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+ Use is subject to license terms.
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
@@ -11,9 +12,8 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301 USA.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/