diff options
| author | unknown <hf@deer.(none)> | 2003-07-19 18:17:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-07-19 18:17:29 +0500 |
| commit | 5aef292a075a49c75590e6cf8e2ffcbdd0b77ca8 (patch) | |
| tree | 3f085dfe9c1a2e4205df93973faab0e2876a5155 /sql/ha_myisam.cc | |
| parent | 0fd6f4049de2f4ba2a4f4197a7ef596ec0598eb6 (diff) | |
| download | mariadb-git-5aef292a075a49c75590e6cf8e2ffcbdd0b77ca8.tar.gz | |
Fix for #712 with Serg's suggestions
myisam/mi_locking.c:
Here we use F_EXTRA_LCK
myisam/myisamchk.c:
lines of "locking - emulation" replaced with mi_lock_database call
myisam/myisamdef.h:
no need for MI_TEMPORARY_TABLE
sql/ha_myisam.cc:
We use F_WRLCK instead MI_TEMPORARY_TABLE
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 969fa3232c3..9059ad803f8 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -560,7 +560,7 @@ int ha_myisam::repair(THD *thd, MI_CHECK ¶m, bool optimize) // Don't lock tables if we have used LOCK TABLE if (!thd->locked_tables && - mi_lock_database(file, table->tmp_table ? MI_TEMPORARY_TABLE : F_WRLCK)) + mi_lock_database(file, table->tmp_table ? F_EXTRA_LCK : F_WRLCK)) { mi_check_print_error(¶m,ER(ER_CANT_LOCK),my_errno); DBUG_RETURN(HA_ADMIN_FAILED); @@ -1002,7 +1002,7 @@ int ha_myisam::external_lock(THD *thd, int lock_type) { return mi_lock_database(file, !table->tmp_table ? lock_type : ((lock_type == F_UNLCK) ? - F_UNLCK : MI_TEMPORARY_TABLE)); + F_UNLCK : F_EXTRA_LCK)); } |