diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
| commit | 9192600eb7c52f2675a67548849409dec2364165 (patch) | |
| tree | 32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /myisam | |
| parent | 9afb49f53cb7b8da7519f45f588a78b559013de3 (diff) | |
| parent | b59b5f4b6ec6bd5b0eb8cee832b6d4f51fa646fc (diff) | |
| download | mariadb-git-9192600eb7c52f2675a67548849409dec2364165.tar.gz | |
Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_locking.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index 057efb96185..e067e80fcf3 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -335,11 +335,10 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer) int _mi_writeinfo(register MI_INFO *info, uint operation) { int error,olderror; - MYISAM_SHARE *share; + MYISAM_SHARE *share=info->s; DBUG_ENTER("_mi_writeinfo"); error=0; - share=info->s; if (share->r_locks == 0 && share->w_locks == 0) { olderror=my_errno; /* Remember last error */ @@ -368,7 +367,7 @@ int _mi_writeinfo(register MI_INFO *info, uint operation) { share->changed= 1; /* Mark keyfile changed */ } - DBUG_RETURN(error); + DBUG_RETURN(error); } /* _mi_writeinfo */ |