summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-08-26 19:43:32 +0400
committerAlexander Nozdrin <alik@sun.com>2009-08-26 19:43:32 +0400
commit09d01ba615c267fb2297c6a34b90835bffda3c23 (patch)
tree71cc81b2e9dde264372bad3721f4897fe688fe6b /storage/innobase
parent24ebb184ca3f9a472d1244edd2170e7ba2babb1b (diff)
parentfc3945950452a12ea7e47c685a73d5d22d338ec2 (diff)
downloadmariadb-git-09d01ba615c267fb2297c6a34b90835bffda3c23.tar.gz
Merge from mysql-5.1-bugteam
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/include/btr0cur.h2
-rw-r--r--storage/innobase/include/trx0types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h
index b2d43ae3254..480a3877e54 100644
--- a/storage/innobase/include/btr0cur.h
+++ b/storage/innobase/include/btr0cur.h
@@ -618,7 +618,7 @@ enum btr_cur_method {
hash_node, and might be necessary to
update */
BTR_CUR_BINARY, /*!< success using the binary search */
- BTR_CUR_INSERT_TO_IBUF, /*!< performed the intended insert to
+ BTR_CUR_INSERT_TO_IBUF /*!< performed the intended insert to
the insert buffer */
};
diff --git a/storage/innobase/include/trx0types.h b/storage/innobase/include/trx0types.h
index 08cc9622d02..24cf57d53d5 100644
--- a/storage/innobase/include/trx0types.h
+++ b/storage/innobase/include/trx0types.h
@@ -70,7 +70,7 @@ typedef struct trx_named_savept_struct trx_named_savept_t;
enum trx_rb_ctx {
RB_NONE = 0, /*!< no rollback */
RB_NORMAL, /*!< normal rollback */
- RB_RECOVERY, /*!< rolling back an incomplete transaction,
+ RB_RECOVERY /*!< rolling back an incomplete transaction,
in crash recovery */
};