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
e2f4aa82
Commit
e2f4aa82
authored
Jan 13, 2007
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More windows warnings cleanup
parent
81b8d086
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
storage/archive/ha_archive.cc
storage/archive/ha_archive.cc
+6
-10
storage/archive/ha_archive.h
storage/archive/ha_archive.h
+1
-1
No files found.
storage/archive/ha_archive.cc
View file @
e2f4aa82
...
@@ -303,7 +303,6 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name,
...
@@ -303,7 +303,6 @@ ARCHIVE_SHARE *ha_archive::get_share(const char *table_name,
length
)))
length
)))
{
{
char
*
tmp_name
;
char
*
tmp_name
;
char
tmp_file_name
[
FN_REFLEN
];
azio_stream
archive_tmp
;
azio_stream
archive_tmp
;
if
(
!
my_multi_malloc
(
MYF
(
MY_WME
|
MY_ZEROFILL
),
if
(
!
my_multi_malloc
(
MYF
(
MY_WME
|
MY_ZEROFILL
),
...
@@ -986,7 +985,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
...
@@ -986,7 +985,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
length
,
record_buffer
->
length
));
length
,
record_buffer
->
length
));
DBUG_ASSERT
(
record_buffer
->
buffer
);
DBUG_ASSERT
(
record_buffer
->
buffer
);
if
(
length
>
record_buffer
->
length
)
;
if
(
length
>
record_buffer
->
length
)
{
{
byte
*
newptr
;
byte
*
newptr
;
if
(
!
(
newptr
=
(
byte
*
)
my_realloc
((
gptr
)
record_buffer
->
buffer
,
if
(
!
(
newptr
=
(
byte
*
)
my_realloc
((
gptr
)
record_buffer
->
buffer
,
...
@@ -1002,7 +1001,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
...
@@ -1002,7 +1001,7 @@ bool ha_archive::fix_rec_buff(unsigned int length)
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
}
}
int
ha_archive
::
unpack_row
(
azio_stream
*
file_to_read
,
char
*
record
)
int
ha_archive
::
unpack_row
(
azio_stream
*
file_to_read
,
byte
*
record
)
{
{
DBUG_ENTER
(
"ha_archive::unpack_row"
);
DBUG_ENTER
(
"ha_archive::unpack_row"
);
...
@@ -1050,7 +1049,9 @@ int ha_archive::unpack_row(azio_stream *file_to_read, char *record)
...
@@ -1050,7 +1049,9 @@ int ha_archive::unpack_row(azio_stream *file_to_read, char *record)
int
ha_archive
::
get_row_version3
(
azio_stream
*
file_to_read
,
byte
*
buf
)
int
ha_archive
::
get_row_version3
(
azio_stream
*
file_to_read
,
byte
*
buf
)
{
{
DBUG_ENTER
(
"ha_archive::get_row_version3"
);
DBUG_ENTER
(
"ha_archive::get_row_version3"
);
int
returnable
=
unpack_row
(
file_to_read
,
buf
);
int
returnable
=
unpack_row
(
file_to_read
,
buf
);
DBUG_RETURN
(
returnable
);
DBUG_RETURN
(
returnable
);
}
}
...
@@ -1284,7 +1285,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
...
@@ -1284,7 +1285,7 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
}
}
dbug_tmp_restore_column_map
(
table
->
read_set
,
org_bitmap
);
dbug_tmp_restore_column_map
(
table
->
read_set
,
org_bitmap
);
share
->
rows_recorded
=
writer
.
rows
;
share
->
rows_recorded
=
(
ha_rows
)
writer
.
rows
;
}
}
DBUG_PRINT
(
"info"
,
(
"recovered %llu archive rows"
,
DBUG_PRINT
(
"info"
,
(
"recovered %llu archive rows"
,
...
@@ -1380,13 +1381,8 @@ void ha_archive::update_create_info(HA_CREATE_INFO *create_info)
...
@@ -1380,13 +1381,8 @@ void ha_archive::update_create_info(HA_CREATE_INFO *create_info)
create_info
->
auto_increment_value
=
stats
.
auto_increment_value
+
1
;
create_info
->
auto_increment_value
=
stats
.
auto_increment_value
+
1
;
}
}
if
(
!
lstat
(
share
->
data_file_name
,
&
stat_buff
)
&&
if
(
!
(
my_readlink
(
share
->
real_path
,
share
->
data_file_name
,
MYF
(
0
))))
S_ISLNK
(
stat_buff
.
st_mode
))
{
if
(
!
(
share
->
real_path
[
0
]))
my_realpath
(
share
->
real_path
,
share
->
data_file_name
,
MYF
(
0
));
create_info
->
data_file_name
=
share
->
real_path
;
create_info
->
data_file_name
=
share
->
real_path
;
}
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
storage/archive/ha_archive.h
View file @
e2f4aa82
...
@@ -140,7 +140,7 @@ class ha_archive: public handler
...
@@ -140,7 +140,7 @@ class ha_archive: public handler
bool
check_and_repair
(
THD
*
thd
);
bool
check_and_repair
(
THD
*
thd
);
uint32
max_row_length
(
const
byte
*
buf
);
uint32
max_row_length
(
const
byte
*
buf
);
bool
fix_rec_buff
(
unsigned
int
length
);
bool
fix_rec_buff
(
unsigned
int
length
);
int
unpack_row
(
azio_stream
*
file_to_read
,
char
*
record
);
int
unpack_row
(
azio_stream
*
file_to_read
,
byte
*
record
);
unsigned
int
pack_row
(
byte
*
record
);
unsigned
int
pack_row
(
byte
*
record
);
};
};
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