diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 21:42:52 +0300 |
| commit | 90e058e0c623f770ee602ebab86e91303f08c90a (patch) | |
| tree | 33aa211800a7c5a746eb4cd1077a06ab8b549642 /strings/strnlen.c | |
| parent | 8b046db411b963f48b06716fab764a35456c43d7 (diff) | |
| parent | ee1950dab11b3b36ca61930c1733ccc4c721f21a (diff) | |
| download | mariadb-git-90e058e0c623f770ee602ebab86e91303f08c90a.tar.gz | |
Automatic merge
Diffstat (limited to 'strings/strnlen.c')
| -rw-r--r-- | strings/strnlen.c | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/strings/strnlen.c b/strings/strnlen.c index 891087a6ebe..c831d63243e 100644 --- a/strings/strnlen.c +++ b/strings/strnlen.c @@ -1,17 +1,31 @@ -/* Copyright (C) 2000 MySQL AB - - 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 - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Copyright Richard A. O'Keefe. + Copyright (c) 2000 TXT DataKonsult Ab & Monty Program Ab + Copyright (c) 2009-2011, Monty Program Ab + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. +*/ /* File : strnlen.c Author : Michael Widenius |