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
6e0e5eef
Commit
6e0e5eef
authored
Jun 06, 2017
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some printf format type mismatch
parent
22fa9f22
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
20 deletions
+22
-20
storage/innobase/buf/buf0dump.cc
storage/innobase/buf/buf0dump.cc
+3
-3
storage/innobase/buf/buf0rea.cc
storage/innobase/buf/buf0rea.cc
+4
-4
storage/innobase/dict/dict0dict.cc
storage/innobase/dict/dict0dict.cc
+3
-2
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+1
-1
storage/innobase/que/que0que.cc
storage/innobase/que/que0que.cc
+2
-1
storage/innobase/row/row0upd.cc
storage/innobase/row/row0upd.cc
+1
-1
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.c
+8
-8
No files found.
storage/innobase/buf/buf0dump.cc
View file @
6e0e5eef
...
...
@@ -394,7 +394,7 @@ buf_dump(
buf_dump_status
(
STATUS_VERBOSE
,
"Dumping buffer pool"
" "
ULINTPF
"/
"
ULINTPF
"
,"
" "
ULINTPF
"/
%lu
,"
" page "
ULINTPF
"/"
ULINTPF
,
i
+
1
,
srv_buf_pool_instances
,
j
+
1
,
n_pages
);
...
...
@@ -595,8 +595,8 @@ buf_load()
if
(
dump
==
NULL
)
{
fclose
(
f
);
buf_load_status
(
STATUS_ERR
,
"Cannot allocate
%lu
bytes: %s"
,
(
ulint
)
(
dump_n
*
sizeof
(
*
dump
)
),
"Cannot allocate
"
ULINTPF
"
bytes: %s"
,
dump_n
*
sizeof
(
*
dump
),
strerror
(
errno
));
return
;
}
...
...
storage/innobase/buf/buf0rea.cc
View file @
6e0e5eef
...
...
@@ -773,11 +773,11 @@ buf_read_ahead_linear(
os_aio_simulated_wake_handler_threads
();
if
(
count
)
{
DBUG_PRINT
(
"ib_buf"
,
(
"linear read-ahead
%lu
pages, "
"%
lu:%l
u"
,
DBUG_PRINT
(
"ib_buf"
,
(
"linear read-ahead
"
ULINTPF
"
pages, "
"%
u:%
u"
,
count
,
(
ulint
)
page_id
.
space
(),
(
ulint
)
page_id
.
page_no
()));
page_id
.
space
(),
page_id
.
page_no
()));
}
/* Read ahead is considered one I/O operation for the purpose of
...
...
storage/innobase/dict/dict0dict.cc
View file @
6e0e5eef
...
...
@@ -4366,7 +4366,7 @@ dict_table_get_highest_foreign_id(
}
DBUG_PRINT
(
"dict_table_get_highest_foreign_id"
,
(
"id:
%lu"
,
biggest_id
));
(
"id:
"
ULINTPF
,
biggest_id
));
DBUG_RETURN
(
biggest_id
);
}
...
...
@@ -6611,7 +6611,8 @@ dict_table_schema_check(
if
((
ulint
)
table
->
n_def
-
n_sys_cols
!=
req_schema
->
n_cols
)
{
/* the table has a different number of columns than required */
ut_snprintf
(
errstr
,
errstr_sz
,
"%s has %lu columns but should have "
ULINTPF
"."
,
"%s has "
ULINTPF
" columns but should have "
ULINTPF
"."
,
ut_format_name
(
req_schema
->
table_name
,
buf
,
sizeof
(
buf
)),
table
->
n_def
-
n_sys_cols
,
...
...
storage/innobase/os/os0file.cc
View file @
6e0e5eef
...
...
@@ -7550,7 +7550,7 @@ AIO::to_file(FILE* file) const
fprintf
(
file
,
"%s IO for %s (offset="
UINT64PF
", size=
%lu
)
\n
"
,
", size=
"
ULINTPF
"
)
\n
"
,
slot
.
type
.
is_read
()
?
"read"
:
"write"
,
slot
.
name
,
slot
.
offset
,
slot
.
len
);
}
...
...
storage/innobase/que/que0que.cc
View file @
6e0e5eef
...
...
@@ -417,7 +417,8 @@ que_graph_free_recursive(
}
DBUG_PRINT
(
"que_graph_free_recursive"
,
(
"node: %p, type: %lu"
,
node
,
que_node_get_type
(
node
)));
(
"node: %p, type: "
ULINTPF
,
node
,
que_node_get_type
(
node
)));
switch
(
que_node_get_type
(
node
))
{
...
...
storage/innobase/row/row0upd.cc
View file @
6e0e5eef
...
...
@@ -3225,7 +3225,7 @@ row_upd(
ut_ad
(
!
thr_get_trx
(
thr
)
->
in_rollback
);
DBUG_PRINT
(
"row_upd"
,
(
"table: %s"
,
node
->
table
->
name
.
m_name
));
DBUG_PRINT
(
"row_upd"
,
(
"info bits in update vector: 0x
%lx"
,
DBUG_PRINT
(
"row_upd"
,
(
"info bits in update vector: 0x
"
ULINTPFx
,
node
->
update
?
node
->
update
->
info_bits
:
0
));
DBUG_PRINT
(
"row_upd"
,
(
"foreign_id: %s"
,
node
->
foreign
?
node
->
foreign
->
id
:
"NULL"
));
...
...
storage/maria/ma_pagecache.c
View file @
6e0e5eef
...
...
@@ -1187,14 +1187,14 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup)
pagecache
->
blocks_changed
=
0
;
}
DBUG_PRINT
(
"status"
,
(
"used: %zu changed: %zu w_requests: %lu "
"writes: %l
u r_requests: %lu reads: %
lu"
,
(
ulong
)
pagecache
->
blocks_used
,
(
ulong
)
pagecache
->
global_blocks_changed
,
(
ulong
)
pagecache
->
global_cache_w_requests
,
(
ulong
)
pagecache
->
global_cache_write
,
(
ulong
)
pagecache
->
global_cache_r_requests
,
(
ulong
)
pagecache
->
global_cache_read
));
DBUG_PRINT
(
"status"
,
(
"used: %zu changed: %zu w_requests: %l
l
u "
"writes: %l
lu r_requests: %llu reads: %l
lu"
,
pagecache
->
blocks_used
,
pagecache
->
global_blocks_changed
,
pagecache
->
global_cache_w_requests
,
pagecache
->
global_cache_write
,
pagecache
->
global_cache_r_requests
,
pagecache
->
global_cache_read
));
if
(
cleanup
)
{
...
...
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