diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-07-20 16:32:13 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-07-20 16:32:13 -0600 |
| commit | b282f4290578f0e8e387fcebcd1641337d2601eb (patch) | |
| tree | b696a6c57f5d204281f851c340f80976b08bb6f7 /include | |
| parent | e642692a5d25d7771ecab767be9fb8b369d077da (diff) | |
| parent | b588c6064638bd9245871cd840695854c1454e8b (diff) | |
| download | mariadb-git-b282f4290578f0e8e387fcebcd1641337d2601eb.tar.gz | |
merged
configure.in:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/rpl_sporadic_master.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_lock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h index 42bcd9bcaba..6dd59f80e64 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -65,6 +65,7 @@ enum thr_lock_type { TL_IGNORE=-1, extern ulong max_write_lock_count; extern my_bool thr_lock_inited; +extern enum thr_lock_type thr_upgraded_concurrent_insert_lock; typedef struct st_thr_lock_data { pthread_t thread; |