diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-12-13 08:59:52 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-12-13 08:59:52 +0200 |
| commit | d2dc0a108673b80f6925fa7cc13218923714468d (patch) | |
| tree | cf22489a371d2dca4c44ee890e456fb11e13a74d /innobase/include/lock0lock.h | |
| parent | b952066259258c1ce8d45ff2fbbee28f1ef27133 (diff) | |
| parent | c418ae98ef303f1388119c1847822d7965b2f7db (diff) | |
| download | mariadb-git-d2dc0a108673b80f6925fa7cc13218923714468d.tar.gz | |
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
innobase/include/lock0lock.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'innobase/include/lock0lock.h')
| -rw-r--r-- | innobase/include/lock0lock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/lock0lock.h b/innobase/include/lock0lock.h index e533ac08545..710c945375c 100644 --- a/innobase/include/lock0lock.h +++ b/innobase/include/lock0lock.h @@ -612,6 +612,8 @@ extern lock_sys_t* lock_sys; #define LOCK_TABLE 16 /* these type values should be so high that */ #define LOCK_REC 32 /* they can be ORed to the lock mode */ #define LOCK_TABLE_EXP 80 /* explicit table lock (80 = 16 + 64) */ +#define LOCK_TABLE_TRANSACTIONAL 144 + /* transactional table lock (144 = 16 + 128)*/ #define LOCK_TYPE_MASK 0xF0UL /* mask used to extract lock type from the type_mode field in a lock */ /* Waiting lock flag */ |