diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-05 23:15:05 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-05 23:15:05 +0200 |
| commit | e8d81970be33a5a6594bfb7a7ea0c0de02647227 (patch) | |
| tree | 07de775d0327927eb8a4c4d3cc563f212497be56 /myisam | |
| parent | ace649189d566532a46ff110db15ccde117ce4af (diff) | |
| download | mariadb-git-e8d81970be33a5a6594bfb7a7ea0c0de02647227.tar.gz | |
Fixed bug in LEFT JOIN
Docs/manual.texi:
ChangeLog
myisam/mi_locking.c:
Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
Release character sets at end
scripts/mysqlhotcopy.sh:
RAID tables are now copied
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_locking.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index e067e80fcf3..de5f0d0c2cf 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -303,10 +303,9 @@ int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer) { if (!share->r_locks && !share->w_locks) { - if ((info->tmp_lock_type=lock_type) != F_RDLCK) - if (my_lock(share->kfile,lock_type,0L,F_TO_EOF, - info->lock_wait | MY_SEEK_NOT_DONE)) - DBUG_RETURN(1); + if (my_lock(share->kfile,lock_type,0L,F_TO_EOF, + info->lock_wait | MY_SEEK_NOT_DONE)) + DBUG_RETURN(1); if (mi_state_info_read_dsk(share->kfile, &share->state, 1)) { int error=my_errno ? my_errno : -1; |