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
e48ae21b
Commit
e48ae21b
authored
Apr 21, 2017
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow-up to MDEV-12534: Fix warnings on 32-bit systems
parent
87b6df31
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+2
-2
storage/innobase/srv/srv0srv.cc
storage/innobase/srv/srv0srv.cc
+2
-2
storage/xtradb/os/os0file.cc
storage/xtradb/os/os0file.cc
+2
-2
storage/xtradb/srv/srv0srv.cc
storage/xtradb/srv/srv0srv.cc
+2
-2
No files found.
storage/innobase/os/os0file.cc
View file @
e48ae21b
...
...
@@ -5647,8 +5647,8 @@ os_aio_print(
os_n_file_writes
,
os_n_fsyncs
);
const
ulint
n_reads
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
);
const
ulint
n_writes
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
);
const
ulint
n_reads
=
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
)
);
const
ulint
n_writes
=
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
)
);
if
(
n_reads
!=
0
||
n_writes
!=
0
)
{
fprintf
(
file
,
...
...
storage/innobase/srv/srv0srv.cc
View file @
e48ae21b
...
...
@@ -1409,10 +1409,10 @@ srv_export_innodb_status(void)
mutex_enter
(
&
srv_innodb_monitor_mutex
);
export_vars
.
innodb_data_pending_reads
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
);
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
)
);
export_vars
.
innodb_data_pending_writes
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
);
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
)
);
export_vars
.
innodb_data_pending_fsyncs
=
fil_n_pending_log_flushes
...
...
storage/xtradb/os/os0file.cc
View file @
e48ae21b
...
...
@@ -5820,8 +5820,8 @@ os_aio_print(
os_n_file_writes
,
os_n_fsyncs
);
const
ulint
n_reads
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
);
const
ulint
n_writes
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
);
const
ulint
n_reads
=
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
)
);
const
ulint
n_writes
=
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
)
);
if
(
n_reads
!=
0
||
n_writes
!=
0
)
{
fprintf
(
file
,
...
...
storage/xtradb/srv/srv0srv.cc
View file @
e48ae21b
...
...
@@ -1735,10 +1735,10 @@ srv_export_innodb_status(void)
mutex_enter
(
&
srv_innodb_monitor_mutex
);
export_vars
.
innodb_data_pending_reads
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
);
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_READS
)
);
export_vars
.
innodb_data_pending_writes
=
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
);
ulint
(
MONITOR_VALUE
(
MONITOR_OS_PENDING_WRITES
)
);
export_vars
.
innodb_data_pending_fsyncs
=
fil_n_pending_log_flushes
...
...
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