diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2007-01-25 01:26:57 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2007-01-25 01:26:57 +0400 |
| commit | c26ffedb86bbc1fa0d4d91e712da5e71454564a9 (patch) | |
| tree | d4286e665753a9f583871c0e642c0d985862893f /include | |
| parent | 3f064efb0ee9089d711a9428bf45900d69e6e399 (diff) | |
| parent | 6bb5fd6b28b6276eea5c9cb928af1f3192d93895 (diff) | |
| download | mariadb-git-c26ffedb86bbc1fa0d4d91e712da5e71454564a9.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually 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 9177438bd0f..966522fe3e3 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -121,6 +121,7 @@ typedef struct st_thr_lock { void (*get_status)(void*, int); /* When one gets a lock */ void (*copy_status)(void*,void*); void (*update_status)(void*); /* Before release of write */ + void (*restore_status)(void*); /* Before release of read */ my_bool (*check_status)(void *); } THR_LOCK; |