database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Clean up one place that misuses LOCK_open (dead code)

Browse Source
This commit is contained in:
unknown
2007-02-22 19:45:06 +03:00
parent bc91e449b6
commit efead7f30c
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/handler.cc
View File

@ -2311,7 +2311,7 @@ int handler::check_old_types()
} }
static bool update_frm_version(TABLE *table, bool needs_lock) static bool update_frm_version(TABLE *table)
{ {
char path[FN_REFLEN]; char path[FN_REFLEN];
File file; File file;
@ -2323,9 +2323,6 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
strxmov(path, table->s->normalized_path.str, reg_ext, NullS); strxmov(path, table->s->normalized_path.str, reg_ext, NullS);
if (needs_lock)
pthread_mutex_lock(&LOCK_open);
if ((file= my_open(path, O_RDWR|O_BINARY, MYF(MY_WME))) >= 0) if ((file= my_open(path, O_RDWR|O_BINARY, MYF(MY_WME))) >= 0)
{ {
uchar version[4]; uchar version[4];
@ -2347,8 +2344,6 @@ static bool update_frm_version(TABLE *table, bool needs_lock)
err: err:
if (file >= 0) if (file >= 0)
VOID(my_close(file,MYF(MY_WME))); VOID(my_close(file,MYF(MY_WME)));
if (needs_lock)
pthread_mutex_unlock(&LOCK_open);
DBUG_RETURN(result); DBUG_RETURN(result);
} }
@ -2465,7 +2460,7 @@ int handler::ha_check(THD *thd, HA_CHECK_OPT *check_opt)
} }
if ((error= check(thd, check_opt))) if ((error= check(thd, check_opt)))
return error; return error;
return update_frm_version(table, 0); return update_frm_version(table);
} }
@ -2474,7 +2469,7 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
int result; int result;
if ((result= repair(thd, check_opt))) if ((result= repair(thd, check_opt)))
return result; return result;
return update_frm_version(table, 0); return update_frm_version(table);
} }