Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
54de3b99
Commit
54de3b99
authored
Feb 22, 2007
by
kostja@bodhi.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up one place that misuses LOCK_open (dead code)
parent
6c9fd859
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
sql/handler.cc
sql/handler.cc
+3
-8
No files found.
sql/handler.cc
View file @
54de3b99
...
@@ -2311,7 +2311,7 @@ int handler::check_old_types()
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment