diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2008-11-21 15:21:50 +0100 |
| commit | 33b194c36ec28528fd349dd17412848de2f1171c (patch) | |
| tree | 68cba4897925b9395dd0bfe53b5b95a777d78637 /include/thr_lock.h | |
| parent | 8d96bcda72df224f7a656cbcc1535a027bada75f (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-33b194c36ec28528fd349dd17412848de2f1171c.tar.gz | |
Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or mysql-test/t/*myisam*.
However there were three new tests mysql-test/suite/parts/t/partition*myisam.test, of which I make here
copies for Maria.
Diffstat (limited to 'include/thr_lock.h')
| -rw-r--r-- | include/thr_lock.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 821c1bf2949..cf27527cad4 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -29,6 +29,14 @@ extern ulong locks_immediate,locks_waited ; enum thr_lock_type { TL_IGNORE=-1, TL_UNLOCK, /* UNLOCK ANY LOCK */ + /* + Parser only! At open_tables() becomes TL_READ or + TL_READ_NO_INSERT depending on the binary log format + (SBR/RBR) and on the table category (log table). + Used for tables that are read by statements which + modify tables. + */ + TL_READ_DEFAULT, TL_READ, /* Read lock */ TL_READ_WITH_SHARED_LOCKS, /* High prior. than TL_WRITE. Allow concurrent insert */ |