← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/row0row.h

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/row0row.h
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1996, 2010, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
257
257
        dict_index_t*   index,  /*!< in: secondary index */
258
258
        dict_index_t**  clust_index,/*!< out: clustered index */
259
259
        mtr_t*          mtr);   /*!< in: mtr */
 
260
 
 
261
/** Result of row_search_index_entry */
 
262
enum row_search_result {
 
263
        ROW_FOUND = 0,          /*!< the record was found */
 
264
        ROW_NOT_FOUND,          /*!< record not found */
 
265
        ROW_BUFFERED,           /*!< one of BTR_INSERT, BTR_DELETE, or
 
266
                                BTR_DELETE_MARK was specified, the
 
267
                                secondary index leaf page was not in
 
268
                                the buffer pool, and the operation was
 
269
                                enqueued in the insert/delete buffer */
 
270
        ROW_NOT_DELETED_REF     /*!< BTR_DELETE was specified, and
 
271
                                row_purge_poss_sec() failed */
 
272
};
 
273
 
260
274
/***************************************************************//**
261
275
Searches an index record.
262
 
@return TRUE if found */
 
276
@return whether the record was found or buffered */
263
277
UNIV_INTERN
264
 
ibool
 
278
enum row_search_result
265
279
row_search_index_entry(
266
280
/*===================*/
267
281
        dict_index_t*   index,  /*!< in: index */