diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-07-01 22:53:08 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-07-01 22:53:08 +0300 |
| commit | c2323bae9ab53711c36784df6f80429cae0b0f7c (patch) | |
| tree | 48da859022231fb1fb4438c6cd19ea79377a115a /innobase | |
| parent | 5bcbe404c011bcbd88e88597578b15b6648a5178 (diff) | |
| download | mariadb-git-c2323bae9ab53711c36784df6f80429cae0b0f7c.tar.gz | |
trx0trx.h, trx0trx.ic, row0mysql.c:
Fix another bug in the fix of Bug #3300
innobase/row/row0mysql.c:
Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.ic:
Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.h:
Fix another bug in the fix of Bug #3300
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/include/trx0trx.h | 4 | ||||
| -rw-r--r-- | innobase/include/trx0trx.ic | 4 | ||||
| -rw-r--r-- | innobase/row/row0mysql.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/innobase/include/trx0trx.h b/innobase/include/trx0trx.h index c45024c3d59..146730d46f8 100644 --- a/innobase/include/trx0trx.h +++ b/innobase/include/trx0trx.h @@ -29,8 +29,8 @@ trx_reset_new_rec_lock_info( /*========================*/ trx_t* trx); /* in: transaction struct */ /***************************************************************** -Registers that we have set a new record lock on an index. We only have -space to store 2 indexes! If this is called more than twice after +Registers that we have set a new record lock on an index. We only have space +to store 2 indexes! If this is called to store more than 2 indexes after trx_reset_new_rec_lock_info(), then this function does nothing. */ UNIV_INLINE void diff --git a/innobase/include/trx0trx.ic b/innobase/include/trx0trx.ic index 0404104aafe..54cf2ff331f 100644 --- a/innobase/include/trx0trx.ic +++ b/innobase/include/trx0trx.ic @@ -52,8 +52,8 @@ trx_reset_new_rec_lock_info( } /***************************************************************** -Registers that we have set a new record lock on an index. We only have -space to store 2 indexes! If this is called more than twice after +Registers that we have set a new record lock on an index. We only have space +to store 2 indexes! If this is called to store more than 2 indexes after trx_reset_new_rec_lock_info(), then this function does nothing. */ UNIV_INLINE void diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 354b7be3e77..2ac0824b331 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -1517,7 +1517,7 @@ row_unlock_for_mysql( &mtr); } - rec = btr_pcur_get_rec(pcur); + rec = btr_pcur_get_rec(clust_pcur); mutex_enter(&kernel_mutex); |