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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0fa75d62
Commit
0fa75d62
authored
5 months ago
by
Aleksey Midenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-30926 different fix
parent
341434be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+2
-5
No files found.
storage/myisam/ha_myisam.cc
View file @
0fa75d62
...
...
@@ -724,14 +724,12 @@ static int compute_vcols(MI_INFO *info, uchar *record, int keynum)
/* This mutex is needed for parallel repair */
mysql_mutex_lock
(
&
info
->
s
->
intern_lock
);
TABLE
*
table
=
(
TABLE
*
)(
info
->
external_ref
);
uchar
*
old_record
=
table
->
field
[
0
]
->
record_ptr
();
table
->
move_fields
(
table
->
field
,
record
,
old_record
);
table
->
move_fields
(
table
->
field
,
record
,
table
->
field
[
0
]
->
record_ptr
());
if
(
keynum
==
-
1
)
// update all vcols
{
int
error
=
table
->
update_virtual_fields
(
table
->
file
,
VCOL_UPDATE_FOR_READ
);
if
(
table
->
update_virtual_fields
(
table
->
file
,
VCOL_UPDATE_INDEXED
))
error
=
1
;
table
->
move_fields
(
table
->
field
,
old_record
,
record
);
mysql_mutex_unlock
(
&
info
->
s
->
intern_lock
);
return
error
;
}
...
...
@@ -744,7 +742,6 @@ static int compute_vcols(MI_INFO *info, uchar *record, int keynum)
if
(
f
->
vcol_info
&&
!
f
->
vcol_info
->
stored_in_db
)
table
->
update_virtual_field
(
f
,
false
);
}
table
->
move_fields
(
table
->
field
,
old_record
,
record
);
mysql_mutex_unlock
(
&
info
->
s
->
intern_lock
);
return
0
;
}
...
...
@@ -1030,7 +1027,7 @@ void ha_myisam::setup_vcols_for_repair(HA_CHECK *param)
void
ha_myisam
::
restore_vcos_after_repair
()
{
if
(
file
->
s
->
base
.
reclength
<
file
->
s
->
vreclength
)
if
(
table
->
vfield
)
{
table
->
move_fields
(
table
->
field
,
table
->
record
[
0
],
table
->
field
[
0
]
->
record_ptr
());
...
...
This diff is collapsed.
Click to expand it.
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