diff options
| author | unknown <gbichot@dl145h.mysql.com> | 2006-09-28 13:22:56 +0200 |
|---|---|---|
| committer | unknown <gbichot@dl145h.mysql.com> | 2006-09-28 13:22:56 +0200 |
| commit | 35d44ab3b31bc07fec7a0f02d61f448af3a476cb (patch) | |
| tree | 9902a82dd6c82c9ad75d408e90e24e08ef8ef18b /storage | |
| parent | 62c30cd5d3ec011e7255f0de9c8bcea5ee83fc3d (diff) | |
| parent | 5e2c06a1c7d937b039fb7a2132506cf7703313d1 (diff) | |
| download | mariadb-git-35d44ab3b31bc07fec7a0f02d61f448af3a476cb.tar.gz | |
Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
into dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.h | 11 |
2 files changed, 16 insertions, 7 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 8fa04246769..aa0c26a5ac5 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -7529,12 +7529,14 @@ This consistent view is then used inside of MySQL when accessing records using a cursor. */ void* -innobase_create_cursor_view(void) -/*=============================*/ - /* out: Pointer to cursor view or NULL */ +innobase_create_cursor_view( +/*========================*/ + /* out: pointer to cursor + view or NULL */ + THD* thd) /* in: user thread handle */ { return(read_cursor_view_create_for_mysql( - check_trx_exists(current_thd))); + check_trx_exists(thd))); } /*********************************************************************** @@ -7545,6 +7547,7 @@ corresponding MySQL thread still lacks one. */ void innobase_close_cursor_view( /*=======================*/ + THD* thd, /* in: user thread handle */ void* curview)/* in: Consistent read view to be closed */ { read_cursor_view_close_for_mysql(check_trx_exists(current_thd), @@ -7560,6 +7563,7 @@ restored to a transaction read view. */ void innobase_set_cursor_view( /*=====================*/ + THD* thd, /* in: user thread handle */ void* curview)/* in: Consistent cursor view to be set */ { read_cursor_set_for_mysql(check_trx_exists(current_thd), diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index 4d5dc6b52d6..ed52ee9b094 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -313,9 +313,11 @@ This consistent view is then used inside of MySQL when accessing records using a cursor. */ void* -innobase_create_cursor_view(void); -/*=============================*/ - /* out: Pointer to cursor view or NULL */ +innobase_create_cursor_view( +/*========================*/ + /* out: pointer to cursor + view or NULL */ + THD* thd); /* in: user thread handle */ /*********************************************************************** Close the given consistent cursor view of a transaction and restore @@ -325,8 +327,10 @@ corresponding MySQL thread still lacks one. */ void innobase_close_cursor_view( /*=======================*/ + THD* thd, /* in: user thread handle */ void* curview); /* in: Consistent read view to be closed */ + /*********************************************************************** Set the given consistent cursor view to a transaction which is created if the corresponding MySQL thread still lacks one. If the given @@ -336,4 +340,5 @@ restored to a transaction read view. */ void innobase_set_cursor_view( /*=====================*/ + THD* thd, /* in: user thread handle */ void* curview); /* in: Consistent read view to be set */ |