diff options
| author | Satya B <satya.bn@sun.com> | 2009-10-16 17:28:02 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-10-16 17:28:02 +0530 |
| commit | d63eb541f51648050467201ee4e148b087174ac6 (patch) | |
| tree | d800c318519c4be386c9f5b47428b6790b8addb2 /storage/innobase/trx/trx0trx.c | |
| parent | 12c7d0cf33b20dfcd548af594542b8a7bda601d2 (diff) | |
| download | mariadb-git-d63eb541f51648050467201ee4e148b087174ac6.tar.gz | |
Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163
also merged missing Innodb plugin revisions r5636,r5635 manually
Diffstat (limited to 'storage/innobase/trx/trx0trx.c')
| -rw-r--r-- | storage/innobase/trx/trx0trx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c index 4d4885062a6..21ba6e481a7 100644 --- a/storage/innobase/trx/trx0trx.c +++ b/storage/innobase/trx/trx0trx.c @@ -803,7 +803,7 @@ trx_commit_off_kernel( in exactly the same order as commit lsn's, if the transactions have different rollback segments. To get exactly the same order we should hold the kernel mutex up to this point, - adding to to the contention of the kernel mutex. However, if + adding to the contention of the kernel mutex. However, if a transaction T2 is able to see modifications made by a transaction T1, T2 will always get a bigger transaction number and a bigger commit lsn than T1. */ @@ -950,7 +950,7 @@ trx_commit_off_kernel( /****************************************************************//** Cleans up a transaction at database startup. The cleanup is needed if the transaction already got to the middle of a commit when the database -crashed, andf we cannot roll it back. */ +crashed, and we cannot roll it back. */ UNIV_INTERN void trx_cleanup_at_db_startup( |