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
9320c933
Commit
9320c933
authored
May 14, 2009
by
Anurag Shekhar
Browse files
Options
Browse Files
Download
Plain Diff
merging with fix for compiler warnings.
parents
d0128f5e
da0fe3cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
storage/archive/ha_archive.cc
storage/archive/ha_archive.cc
+2
-2
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+2
-2
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+1
-1
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+3
-3
No files found.
storage/archive/ha_archive.cc
View file @
9320c933
...
@@ -1474,8 +1474,8 @@ int ha_archive::info(uint flag)
...
@@ -1474,8 +1474,8 @@ int ha_archive::info(uint flag)
stats
.
mean_rec_length
=
table
->
s
->
reclength
+
buffer
.
alloced_length
();
stats
.
mean_rec_length
=
table
->
s
->
reclength
+
buffer
.
alloced_length
();
stats
.
data_file_length
=
file_stat
.
st_size
;
stats
.
data_file_length
=
file_stat
.
st_size
;
stats
.
create_time
=
file_stat
.
st_ctime
;
stats
.
create_time
=
(
ulong
)
file_stat
.
st_ctime
;
stats
.
update_time
=
file_stat
.
st_mtime
;
stats
.
update_time
=
(
ulong
)
file_stat
.
st_mtime
;
stats
.
max_data_file_length
=
share
->
rows_recorded
*
stats
.
mean_rec_length
;
stats
.
max_data_file_length
=
share
->
rows_recorded
*
stats
.
mean_rec_length
;
}
}
stats
.
delete_length
=
0
;
stats
.
delete_length
=
0
;
...
...
storage/federated/ha_federated.cc
View file @
9320c933
...
@@ -2850,10 +2850,10 @@ int ha_federated::info(uint flag)
...
@@ -2850,10 +2850,10 @@ int ha_federated::info(uint flag)
stats
.
data_file_length
=
stats
.
records
*
stats
.
mean_rec_length
;
stats
.
data_file_length
=
stats
.
records
*
stats
.
mean_rec_length
;
if
(
row
[
12
]
!=
NULL
)
if
(
row
[
12
]
!=
NULL
)
stats
.
update_time
=
(
time_t
)
my_strtoll10
(
row
[
12
],
(
char
**
)
0
,
stats
.
update_time
=
(
ulong
)
my_strtoll10
(
row
[
12
],
(
char
**
)
0
,
&
error
);
&
error
);
if
(
row
[
13
]
!=
NULL
)
if
(
row
[
13
]
!=
NULL
)
stats
.
check_time
=
(
time_t
)
my_strtoll10
(
row
[
13
],
(
char
**
)
0
,
stats
.
check_time
=
(
ulong
)
my_strtoll10
(
row
[
13
],
(
char
**
)
0
,
&
error
);
&
error
);
}
}
/*
/*
...
...
storage/innobase/handler/ha_innodb.cc
View file @
9320c933
...
@@ -6012,7 +6012,7 @@ ha_innobase::info(
...
@@ -6012,7 +6012,7 @@ ha_innobase::info(
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
if
(
os_file_get_status
(
path
,
&
stat_info
))
{
if
(
os_file_get_status
(
path
,
&
stat_info
))
{
stats
.
create_time
=
stat_info
.
ctime
;
stats
.
create_time
=
(
ulong
)
stat_info
.
ctime
;
}
}
}
}
...
...
storage/myisam/ha_myisam.cc
View file @
9320c933
...
@@ -1784,7 +1784,7 @@ int ha_myisam::info(uint flag)
...
@@ -1784,7 +1784,7 @@ int ha_myisam::info(uint flag)
stats
.
data_file_length
=
misam_info
.
data_file_length
;
stats
.
data_file_length
=
misam_info
.
data_file_length
;
stats
.
index_file_length
=
misam_info
.
index_file_length
;
stats
.
index_file_length
=
misam_info
.
index_file_length
;
stats
.
delete_length
=
misam_info
.
delete_length
;
stats
.
delete_length
=
misam_info
.
delete_length
;
stats
.
check_time
=
misam_info
.
check_time
;
stats
.
check_time
=
(
ulong
)
misam_info
.
check_time
;
stats
.
mean_rec_length
=
misam_info
.
mean_reclength
;
stats
.
mean_rec_length
=
misam_info
.
mean_reclength
;
}
}
if
(
flag
&
HA_STATUS_CONST
)
if
(
flag
&
HA_STATUS_CONST
)
...
@@ -1792,7 +1792,7 @@ int ha_myisam::info(uint flag)
...
@@ -1792,7 +1792,7 @@ int ha_myisam::info(uint flag)
TABLE_SHARE
*
share
=
table
->
s
;
TABLE_SHARE
*
share
=
table
->
s
;
stats
.
max_data_file_length
=
misam_info
.
max_data_file_length
;
stats
.
max_data_file_length
=
misam_info
.
max_data_file_length
;
stats
.
max_index_file_length
=
misam_info
.
max_index_file_length
;
stats
.
max_index_file_length
=
misam_info
.
max_index_file_length
;
stats
.
create_time
=
misam_info
.
create_time
;
stats
.
create_time
=
(
ulong
)
misam_info
.
create_time
;
ref_length
=
misam_info
.
reflength
;
ref_length
=
misam_info
.
reflength
;
share
->
db_options_in_use
=
misam_info
.
options
;
share
->
db_options_in_use
=
misam_info
.
options
;
stats
.
block_size
=
myisam_block_size
;
/* record block size */
stats
.
block_size
=
myisam_block_size
;
/* record block size */
...
@@ -1831,7 +1831,7 @@ int ha_myisam::info(uint flag)
...
@@ -1831,7 +1831,7 @@ int ha_myisam::info(uint flag)
my_store_ptr
(
dup_ref
,
ref_length
,
misam_info
.
dupp_key_pos
);
my_store_ptr
(
dup_ref
,
ref_length
,
misam_info
.
dupp_key_pos
);
}
}
if
(
flag
&
HA_STATUS_TIME
)
if
(
flag
&
HA_STATUS_TIME
)
stats
.
update_time
=
misam_info
.
update_time
;
stats
.
update_time
=
(
ulong
)
misam_info
.
update_time
;
if
(
flag
&
HA_STATUS_AUTO
)
if
(
flag
&
HA_STATUS_AUTO
)
stats
.
auto_increment_value
=
misam_info
.
auto_increment
;
stats
.
auto_increment_value
=
misam_info
.
auto_increment
;
...
...
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