summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/api0api.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-26 19:21:23 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-26 19:21:23 +0100
commitac585e9ed5d4073b023387c77f90c278f137e469 (patch)
tree852de46e59c6763c02647a28f87af76df6d1c582 /storage/xtradb/include/api0api.h
parent6bc7bd0eb233aa08702bcc0f0c3ca8b73fc32294 (diff)
parentb338c8eb56d92bc3a5f4665ad74e93a840eb96d3 (diff)
downloadmariadb-git-ac585e9ed5d4073b023387c77f90c278f137e469.tar.gz
Percona-Server-5.6.15-rel63.0.tar.gz merge
Diffstat (limited to 'storage/xtradb/include/api0api.h')
-rw-r--r--storage/xtradb/include/api0api.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/storage/xtradb/include/api0api.h b/storage/xtradb/include/api0api.h
index 1d6aaab60bc..c294e3f34d5 100644
--- a/storage/xtradb/include/api0api.h
+++ b/storage/xtradb/include/api0api.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2011, 2013, 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
@@ -460,6 +460,10 @@ ib_trx_start(
/*=========*/
ib_trx_t ib_trx, /*!< in: transaction to restart */
ib_trx_level_t ib_trx_level, /*!< in: trx isolation level */
+ ib_bool_t read_write, /*!< in: true if read write
+ transaction */
+ ib_bool_t auto_commit, /*!< in: auto commit after each
+ single DML */
void* thd); /*!< in: THD */
/*****************************************************************//**
@@ -470,7 +474,11 @@ put the transaction in the active state.
ib_trx_t
ib_trx_begin(
/*=========*/
- ib_trx_level_t ib_trx_level); /*!< in: trx isolation level */
+ ib_trx_level_t ib_trx_level, /*!< in: trx isolation level */
+ ib_bool_t read_write, /*!< in: true if read write
+ transaction */
+ ib_bool_t auto_commit); /*!< in: auto commit after each
+ single DML */
/*****************************************************************//**
Query the transaction's state. This function can be used to check for
@@ -669,7 +677,9 @@ ib_err_t
ib_cursor_read_row(
/*===============*/
ib_crsr_t ib_crsr, /*!< in: InnoDB cursor instance */
- ib_tpl_t ib_tpl); /*!< out: read cols into this tuple */
+ ib_tpl_t ib_tpl, /*!< out: read cols into this tuple */
+ void** row_buf, /*!< in/out: row buffer */
+ ib_ulint_t* row_len); /*!< in/out: row buffer len */
/*****************************************************************//**
Move cursor to the first record in the table.