diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
| commit | 1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (patch) | |
| tree | 17ba1ed90233efa64bc83364ed1ffb74dd637ead /strings/int2str.c | |
| parent | ce55d37929fc91b476541d3a77336a44b20317ac (diff) | |
| parent | 90e058e0c623f770ee602ebab86e91303f08c90a (diff) | |
| download | mariadb-git-1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'strings/int2str.c')
| -rw-r--r-- | strings/int2str.c | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/strings/int2str.c b/strings/int2str.c index 03e846c31dc..f2a5c15f32c 100644 --- a/strings/int2str.c +++ b/strings/int2str.c @@ -1,17 +1,30 @@ -/* 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 (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. +*/ #include "strings_def.h" |