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 /sql/handler.h | |
| 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 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/handler.h b/sql/handler.h index 1250388f459..fbc52170297 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -3,18 +3,20 @@ /* 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 */ /* Definitions for parameters to do with handler-routines */ @@ -60,7 +62,7 @@ a table with rnd_next() - We will see all rows (including deleted ones) - Row positions are 'table->s->db_record_offset' apart - If this flag is not set, filesort will do a postion() call for each matched + If this flag is not set, filesort will do a position() call for each matched row to be able to find the row later. */ #define HA_REC_NOT_IN_SEQ (1 << 3) |