diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-19 20:41:19 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-19 20:41:19 +0300 |
| commit | e69d8fb32a97cd7269f01ecc60b74f710e4a7c6b (patch) | |
| tree | b9a43fcdfcccfe2291c2db879da2011530b4339f /myisam/mi_locking.c | |
| parent | 19a2e7c16b8faf0264a0ee046374784e2a4158ad (diff) | |
| download | mariadb-git-e69d8fb32a97cd7269f01ecc60b74f710e4a7c6b.tar.gz | |
Fix for BDB and LOCK TABLES
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Delete: innobase/ib_config.h.in
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Delete: innobase/ib_config.h
Docs/manual.texi:
Changelog
myisam/mi_locking.c:
Cleanup
mysql-test/r/bdb.result:
Test for LOCK TABLES
mysql-test/r/innodb.result:
Test for LOCK TABLES
mysql-test/t/bdb.test:
Test for LOCK TABLES
mysql-test/t/innodb.test:
Test for LOCK TABLES
sql-bench/test-insert.sh:
Allow loop to be small
sql/ha_berkeley.cc:
Fixed bug when using LOCK TABLES with BDB
sql/ha_berkeley.h:
Fixed bug when using LOCK TABLES with BDB
sql/handler.h:
Fixed bug when using LOCK TABLES with BDB
sql/sql_base.cc:
Fixed bug when using LOCK TABLES with BDB
sql/sql_parse.cc:
UNLOCK TABLES ends transaction
sql/sql_select.cc:
Fix to not call index_end() twice
Diffstat (limited to 'myisam/mi_locking.c')
| -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 */ |