diff options
| author | unknown <svoj@april.(none)> | 2007-01-25 01:44:30 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-01-25 01:44:30 +0400 |
| commit | 1cf811786303b6626a16807425c264835ff22857 (patch) | |
| tree | b1cc56ee11a118751bf1f6774d9f8f0737db5f1d /include | |
| parent | e57ef96a08b7339a9e6a546fd8a603d98a6aa072 (diff) | |
| parent | e8ca911f5d527b6364844dfd573877d578b0d095 (diff) | |
| download | mariadb-git-1cf811786303b6626a16807425c264835ff22857.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
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 363babeaa63..99bb7545006 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; |