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 /client/mysqltest.cc | |
| 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 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 6f19952302c..a6bd80059c1 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -10071,7 +10071,7 @@ int find_set(REP_SETS *sets,REP_SET *find) return i; } } - return i; /* return new postion */ + return i; /* return new position */ } /* find if there is a found_set with same table_offset & found_offset @@ -10091,7 +10091,7 @@ int find_found(FOUND_SET *found_set,uint table_offset, int found_offset) found_set[i].table_offset=table_offset; found_set[i].found_offset=found_offset; found_sets++; - return -i-2; /* return new postion */ + return -i-2; /* return new position */ } /* Return 1 if regexp starts with \b or ends with \b*/ |