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
9961a57e
Commit
9961a57e
authored
Jul 26, 2002
by
serg@sergbook.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mi_repair* functions need a separate rec_buff :(
parent
4b39d33c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
myisam/mi_check.c
myisam/mi_check.c
+5
-3
No files found.
myisam/mi_check.c
View file @
9961a57e
...
@@ -1144,7 +1144,6 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
...
@@ -1144,7 +1144,6 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
MYF
(
MY_WME
|
MY_WAIT_IF_FULL
)))
MYF
(
MY_WME
|
MY_WAIT_IF_FULL
)))
goto
err
;
goto
err
;
info
->
opt_flag
|=
WRITE_CACHE_USED
;
info
->
opt_flag
|=
WRITE_CACHE_USED
;
sort_param
.
rec_buff
=
info
->
rec_buff
;
if
(
!
(
sort_param
.
record
=
(
byte
*
)
my_malloc
((
uint
)
share
->
base
.
pack_reclength
,
if
(
!
(
sort_param
.
record
=
(
byte
*
)
my_malloc
((
uint
)
share
->
base
.
pack_reclength
,
MYF
(
0
))))
MYF
(
0
))))
{
{
...
@@ -1343,6 +1342,8 @@ err:
...
@@ -1343,6 +1342,8 @@ err:
}
}
mi_mark_crashed_on_repair
(
info
);
mi_mark_crashed_on_repair
(
info
);
}
}
my_free
(
mi_get_rec_buff_ptr
(
info
,
sort_param
.
rec_buff
),
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_param
.
record
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_param
.
record
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_info
.
buff
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_info
.
buff
,
MYF
(
MY_ALLOW_ZERO_PTR
));
VOID
(
end_io_cache
(
&
param
->
read_cache
));
VOID
(
end_io_cache
(
&
param
->
read_cache
));
...
@@ -1807,7 +1808,6 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
...
@@ -1807,7 +1808,6 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
info
->
opt_flag
|=
WRITE_CACHE_USED
;
info
->
opt_flag
|=
WRITE_CACHE_USED
;
info
->
rec_cache
.
file
=
info
->
dfile
;
/* for sort_delete_record */
info
->
rec_cache
.
file
=
info
->
dfile
;
/* for sort_delete_record */
sort_param
.
rec_buff
=
info
->
rec_buff
;
if
(
!
(
sort_param
.
record
=
(
byte
*
)
my_malloc
((
uint
)
share
->
base
.
pack_reclength
,
if
(
!
(
sort_param
.
record
=
(
byte
*
)
my_malloc
((
uint
)
share
->
base
.
pack_reclength
,
MYF
(
0
))))
MYF
(
0
))))
{
{
...
@@ -2087,8 +2087,10 @@ err:
...
@@ -2087,8 +2087,10 @@ err:
share
->
state
.
changed
&=
~
STATE_NOT_OPTIMIZED_KEYS
;
share
->
state
.
changed
&=
~
STATE_NOT_OPTIMIZED_KEYS
;
share
->
state
.
changed
|=
STATE_NOT_SORTED_PAGES
;
share
->
state
.
changed
|=
STATE_NOT_SORTED_PAGES
;
my_free
((
gptr
)
sort_info
.
key_block
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mi_get_rec_buff_ptr
(
info
,
sort_param
.
rec_buff
),
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_param
.
record
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_param
.
record
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
((
gptr
)
sort_info
.
key_block
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_info
.
buff
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
sort_info
.
buff
,
MYF
(
MY_ALLOW_ZERO_PTR
));
VOID
(
end_io_cache
(
&
param
->
read_cache
));
VOID
(
end_io_cache
(
&
param
->
read_cache
));
info
->
opt_flag
&=
~
(
READ_CACHE_USED
|
WRITE_CACHE_USED
);
info
->
opt_flag
&=
~
(
READ_CACHE_USED
|
WRITE_CACHE_USED
);
...
...
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