summaryrefslogtreecommitdiff
path: root/storage/maria/trnman.h
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
committerunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
commit631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch)
tree2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/maria/trnman.h
parentcfdd73369c0c2d57908af8dc727de33567fe9e0b (diff)
downloadmariadb-git-631ecaabea7336a8f28367c0d1c291f0433f7e88.tar.gz
Merged with mysql-5.1 main tree.
BUILD/compile-pentium-debug-max: Added definition after macro was removed from main tree. This will be fixed back in main tree later.
Diffstat (limited to 'storage/maria/trnman.h')
-rw-r--r--storage/maria/trnman.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/trnman.h b/storage/maria/trnman.h
index 1a4423f2a11..fce02d9ab89 100644
--- a/storage/maria/trnman.h
+++ b/storage/maria/trnman.h
@@ -24,7 +24,7 @@ C_MODE_START
#include "ma_loghandler_lsn.h"
/*
- trid - 6 byte transaction identifier. Assigned when a transaction
+ trid - 6 uchar transaction identifier. Assigned when a transaction
is created. Transaction can always be identified by its trid,
even after transaction has ended.