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
cfd78595
Commit
cfd78595
authored
Jun 23, 2004
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
c03addab
3bcbdcb4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
9 deletions
+22
-9
sql/ha_myisam.cc
sql/ha_myisam.cc
+22
-9
No files found.
sql/ha_myisam.cc
View file @
cfd78595
...
...
@@ -1013,7 +1013,15 @@ bool ha_myisam::check_and_repair(THD *thd)
if
(
!
file
->
state
->
del
&&
(
myisam_recover_options
&
HA_RECOVER_QUICK
))
check_opt
.
flags
|=
T_QUICK
;
sql_print_error
(
"Warning: Checking table: '%s'"
,
table
->
path
);
if
((
marked_crashed
=
mi_is_crashed
(
file
))
||
check
(
thd
,
&
check_opt
))
if
((
marked_crashed
=
mi_is_crashed
(
file
)))
{
char
*
old_query
=
thd
->
query
;
uint
old_query_length
=
thd
->
query_length
;
pthread_mutex_lock
(
&
LOCK_thread_count
);
thd
->
query
=
table
->
real_name
;
thd
->
query_length
=
strlen
(
table
->
real_name
);
pthread_mutex_unlock
(
&
LOCK_thread_count
);
if
(
check
(
thd
,
&
check_opt
))
{
sql_print_error
(
"Warning: Recovering table: '%s'"
,
table
->
path
);
check_opt
.
flags
=
...
...
@@ -1024,6 +1032,11 @@ bool ha_myisam::check_and_repair(THD *thd)
if
(
repair
(
thd
,
&
check_opt
))
error
=
1
;
}
pthread_mutex_lock
(
&
LOCK_thread_count
);
thd
->
query
=
old_query
;
thd
->
query_length
=
old_query_length
;
pthread_mutex_unlock
(
&
LOCK_thread_count
);
}
DBUG_RETURN
(
error
);
}
...
...
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