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
644ffdeb
Commit
644ffdeb
authored
Nov 08, 2017
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix integer type mismatch in WSREP debug output
parent
28c3459a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+4
-3
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+4
-3
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
644ffdeb
...
...
@@ -10418,7 +10418,7 @@ wsrep_append_foreign_key(
shared
?
WSREP_KEY_SHARED
:
WSREP_KEY_EXCLUSIVE
,
copy
);
if
(
rcode
)
{
DBUG_PRINT
(
"wsrep"
,
(
"row key failed: %
l
u"
,
rcode
));
DBUG_PRINT
(
"wsrep"
,
(
"row key failed: %
z
u"
,
rcode
));
WSREP_ERROR
(
"Appending cascaded fk row key failed: %s, %lu"
,
(
wsrep_thd_query
(
thd
))
?
wsrep_thd_query
(
thd
)
:
"void"
,
rcode
);
...
...
@@ -18709,7 +18709,7 @@ wsrep_innobase_kill_one_trx(
wsrep_thd_awake
(
thd
,
signal
);
}
else
{
/* abort currently executing query */
DBUG_PRINT
(
"wsrep"
,(
"sending KILL_QUERY to: %l
d
"
,
DBUG_PRINT
(
"wsrep"
,(
"sending KILL_QUERY to: %l
u
"
,
thd_get_thread_id
(
thd
)));
WSREP_DEBUG
(
"kill query for: %ld"
,
thd_get_thread_id
(
thd
));
...
...
@@ -18840,7 +18840,8 @@ wsrep_fake_trx_id(
mutex_enter
(
&
trx_sys
->
mutex
);
trx_id_t
trx_id
=
trx_sys_get_new_trx_id
();
mutex_exit
(
&
trx_sys
->
mutex
);
WSREP_DEBUG
(
"innodb fake trx id: %lu thd: %s"
,
trx_id
,
wsrep_thd_query
(
thd
));
WSREP_DEBUG
(
"innodb fake trx id: "
TRX_ID_FMT
" thd: %s"
,
trx_id
,
wsrep_thd_query
(
thd
));
wsrep_ws_handle_for_trx
(
wsrep_thd_ws_handle
(
thd
),
trx_id
);
}
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
644ffdeb
...
...
@@ -10984,7 +10984,7 @@ wsrep_append_foreign_key(
shared
?
WSREP_KEY_SHARED
:
WSREP_KEY_EXCLUSIVE
,
copy
);
if
(
rcode
)
{
DBUG_PRINT
(
"wsrep"
,
(
"row key failed: %
l
u"
,
rcode
));
DBUG_PRINT
(
"wsrep"
,
(
"row key failed: %
z
u"
,
rcode
));
WSREP_ERROR
(
"Appending cascaded fk row key failed: %s, %lu"
,
(
wsrep_thd_query
(
thd
))
?
wsrep_thd_query
(
thd
)
:
"void"
,
rcode
);
...
...
@@ -19751,7 +19751,7 @@ wsrep_innobase_kill_one_trx(
wsrep_thd_awake
(
thd
,
signal
);
}
else
{
/* abort currently executing query */
DBUG_PRINT
(
"wsrep"
,(
"sending KILL_QUERY to: %l
d
"
,
DBUG_PRINT
(
"wsrep"
,(
"sending KILL_QUERY to: %l
u
"
,
thd_get_thread_id
(
thd
)));
WSREP_DEBUG
(
"kill query for: %ld"
,
thd_get_thread_id
(
thd
));
...
...
@@ -19878,7 +19878,8 @@ wsrep_fake_trx_id(
mutex_enter
(
&
trx_sys
->
mutex
);
trx_id_t
trx_id
=
trx_sys_get_new_trx_id
();
mutex_exit
(
&
trx_sys
->
mutex
);
WSREP_DEBUG
(
"innodb fake trx id: %lu thd: %s"
,
trx_id
,
wsrep_thd_query
(
thd
));
WSREP_DEBUG
(
"innodb fake trx id: "
TRX_ID_FMT
" thd: %s"
,
trx_id
,
wsrep_thd_query
(
thd
));
wsrep_ws_handle_for_trx
(
wsrep_thd_ws_handle
(
thd
),
trx_id
);
}
...
...
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