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
7a804530
Commit
7a804530
authored
Sep 25, 2002
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents
f3558eee
31b0520e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
myisam/mi_check.c
myisam/mi_check.c
+2
-4
myisam/myisamchk.c
myisam/myisamchk.c
+2
-1
No files found.
myisam/mi_check.c
View file @
7a804530
...
@@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
...
@@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
ulong
block_length
,
reclength
;
ulong
block_length
,
reclength
;
byte
*
from
;
byte
*
from
;
byte
block_buff
[
8
];
byte
block_buff
[
8
];
MI_INFO
*
info
;
SORT_INFO
*
sort_info
=
sort_param
->
sort_info
;
SORT_INFO
*
sort_info
=
sort_param
->
sort_info
;
MYISAM_SHARE
*
share
;
MI_CHECK
*
param
=
sort_info
->
param
;
MI_CHECK
*
param
=
sort_info
->
param
;
MI_INFO
*
info
=
sort_info
->
info
;
MYISAM_SHARE
*
share
=
info
->
s
;
DBUG_ENTER
(
"sort_write_record"
);
DBUG_ENTER
(
"sort_write_record"
);
info
=
sort_info
->
info
;
share
=
info
->
s
;
if
(
sort_param
->
fix_datafile
)
if
(
sort_param
->
fix_datafile
)
{
{
switch
(
sort_info
->
new_data_file_type
)
{
switch
(
sort_info
->
new_data_file_type
)
{
...
...
myisam/myisamchk.c
View file @
7a804530
...
@@ -72,7 +72,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name);
...
@@ -72,7 +72,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name);
static
int
mi_sort_records
(
MI_CHECK
*
param
,
register
MI_INFO
*
info
,
static
int
mi_sort_records
(
MI_CHECK
*
param
,
register
MI_INFO
*
info
,
my_string
name
,
uint
sort_key
,
my_string
name
,
uint
sort_key
,
my_bool
write_info
,
my_bool
update_index
);
my_bool
write_info
,
my_bool
update_index
);
static
int
sort_record_index
(
MI_SORT_PARAM
*
sort_param
,
MI_INFO
*
info
,
static
int
sort_record_index
(
MI_SORT_PARAM
*
sort_param
,
MI_INFO
*
info
,
MI_KEYDEF
*
keyinfo
,
MI_KEYDEF
*
keyinfo
,
my_off_t
page
,
uchar
*
buff
,
uint
sortkey
,
my_off_t
page
,
uchar
*
buff
,
uint
sortkey
,
File
new_file
,
my_bool
update_index
);
File
new_file
,
my_bool
update_index
);
...
@@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param,
...
@@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param,
sort_info
.
info
=
info
;
sort_info
.
info
=
info
;
sort_info
.
new_data_file_type
=
share
->
data_file_type
;
sort_info
.
new_data_file_type
=
share
->
data_file_type
;
sort_param
.
fix_datafile
=
1
;
sort_param
.
fix_datafile
=
1
;
sort_param
.
master
=
1
;
sort_param
.
filepos
=
share
->
pack
.
header_length
;
sort_param
.
filepos
=
share
->
pack
.
header_length
;
old_record_count
=
info
->
state
->
records
;
old_record_count
=
info
->
state
->
records
;
info
->
state
->
records
=
0
;
info
->
state
->
records
=
0
;
...
...
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