diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-05-06 00:50:31 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-05-06 00:50:31 +0100 |
| commit | 6f3e97a6cb37912360825f645c403484909ab931 (patch) | |
| tree | df32859fdf997f27d44947d33fadbfb023956c49 /extra | |
| parent | 9b5ca1b9f4bae23dd04fca17e8ef9404ab8b611b (diff) | |
| parent | ed6aae83c3dd8e78e024bbb2bae49467a3fc0de3 (diff) | |
| download | mariadb-git-6f3e97a6cb37912360825f645c403484909ab931.tar.gz | |
BUG#11762616: BUG#55229: 'POSTION'
Manual merge from mysql-5.1 into mysql-5.5.
Conflicts
=========
Text conflict in mysql-test/suite/rpl/t/rpl_row_until.test
Text conflict in sql/handler.h
Text conflict in storage/archive/ha_archive.cc
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/replace.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/extra/replace.c b/extra/replace.c index 2ce374726eb..21b9acb6f0c 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -1,17 +1,19 @@ -/* Copyright (C) 2000 MySQL AB +/* 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 - the Free Software Foundation; version 2 of the License. + 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 + 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 */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA */ /* Replace strings in textfile @@ -818,7 +820,7 @@ static short find_set(REP_SETS *sets,REP_SET *find) return (short) i; } } - return (short) i; /* return new postion */ + return (short) i; /* return new position */ } @@ -841,7 +843,7 @@ static short find_found(FOUND_SET *found_set,uint table_offset, found_set[i].table_offset=table_offset; found_set[i].found_offset=found_offset; found_sets++; - return (short) (-i-2); /* return new postion */ + return (short) (-i-2); /* return new position */ } /* Return 1 if regexp starts with \b or ends with \b*/ |