diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-03-20 15:01:47 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-03-20 15:01:47 +0300 |
| commit | 7df026676b6d845cc0ed7a7437995c3019a5f42d (patch) | |
| tree | dc051ac4712ac159b52fc2b48e5dd918cbc39799 /storage/innodb_plugin/include/trx0trx.h | |
| parent | f59d1dcf0acc12c482c28c902a0030f12ba263af (diff) | |
| parent | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (diff) | |
| download | mariadb-git-7df026676b6d845cc0ed7a7437995c3019a5f42d.tar.gz | |
Merge MariaDB-5.2 -> MariaDB 5.3
Diffstat (limited to 'storage/innodb_plugin/include/trx0trx.h')
| -rw-r--r-- | storage/innodb_plugin/include/trx0trx.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/innodb_plugin/include/trx0trx.h b/storage/innodb_plugin/include/trx0trx.h index 681feeaec94..5f2c1246f37 100644 --- a/storage/innodb_plugin/include/trx0trx.h +++ b/storage/innodb_plugin/include/trx0trx.h @@ -179,7 +179,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( @@ -338,9 +338,7 @@ trx_commit_step( /**********************************************************************//** Prints info about a transaction to the given file. The caller must own the -kernel mutex and must have called -innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL -or InnoDB cannot meanwhile change the info printed here. */ +kernel mutex. */ UNIV_INTERN void trx_print( @@ -360,7 +358,7 @@ enum trx_dict_op { operation modes in crash recovery. */ TRX_DICT_OP_TABLE = 1, /** The transaction is creating or dropping an index in an - existing table. In crash recovery, the the data dictionary + existing table. In crash recovery, the data dictionary must be locked, but the table must not be dropped. */ TRX_DICT_OP_INDEX = 2 }; |