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
9b93534c
Commit
9b93534c
authored
Jul 13, 2004
by
guilhem@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
parents
c2ca8e1a
a009af5e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
sql/ha_myisam.cc
sql/ha_myisam.cc
+2
-2
No files found.
sql/ha_myisam.cc
View file @
9b93534c
...
@@ -336,7 +336,7 @@ int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
...
@@ -336,7 +336,7 @@ int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
HA_STATUS_CONST
);
HA_STATUS_CONST
);
}
}
}
}
else
if
(
!
mi_is_crashed
(
file
))
else
if
(
!
mi_is_crashed
(
file
)
&&
!
thd
->
killed
)
{
{
mi_mark_crashed
(
file
);
mi_mark_crashed
(
file
);
file
->
update
|=
HA_STATE_CHANGED
|
HA_STATE_ROW_CHANGED
;
file
->
update
|=
HA_STATE_CHANGED
|
HA_STATE_ROW_CHANGED
;
...
@@ -378,7 +378,7 @@ int ha_myisam::analyze(THD *thd, HA_CHECK_OPT* check_opt)
...
@@ -378,7 +378,7 @@ int ha_myisam::analyze(THD *thd, HA_CHECK_OPT* check_opt)
error
=
update_state_info
(
&
param
,
file
,
UPDATE_STAT
);
error
=
update_state_info
(
&
param
,
file
,
UPDATE_STAT
);
pthread_mutex_unlock
(
&
share
->
intern_lock
);
pthread_mutex_unlock
(
&
share
->
intern_lock
);
}
}
else
if
(
!
mi_is_crashed
(
file
))
else
if
(
!
mi_is_crashed
(
file
)
&&
!
thd
->
killed
)
mi_mark_crashed
(
file
);
mi_mark_crashed
(
file
);
return
error
?
HA_ADMIN_CORRUPT
:
HA_ADMIN_OK
;
return
error
?
HA_ADMIN_CORRUPT
:
HA_ADMIN_OK
;
}
}
...
...
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