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
9ff49836
Commit
9ff49836
authored
Oct 02, 2013
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#90 set tokudb_last_lock_timeout to a string parsable by the python json module
parent
374ea3bc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
storage/tokudb/hatoku_hton.cc
storage/tokudb/hatoku_hton.cc
+9
-9
No files found.
storage/tokudb/hatoku_hton.cc
View file @
9ff49836
...
...
@@ -1824,9 +1824,9 @@ static void tokudb_lock_timeout_callback(DB *db, uint64_t requesting_txnid, cons
log_str
.
append
(
"{"
);
log_str
.
append
(
"
\"
mysql_thread_id
\"
:"
);
log_str
.
append_ulonglong
(
thd
->
thread_id
);
log_str
.
append
(
",
\"
dbname
\"
:
\"
"
);
log_str
.
append
(
tokudb_get_index_name
(
db
)
);
log_str
.
append
(
"
\"
,
\"
requesting_txnid
\"
:"
);
log_str
.
append
(
",
\"
dbname
\"
:"
);
log_str
.
append
(
"
\"
"
);
log_str
.
append
(
tokudb_get_index_name
(
db
));
log_str
.
append
(
"
\"
"
);
log_str
.
append
(
",
\"
requesting_txnid
\"
:"
);
log_str
.
append_ulonglong
(
requesting_txnid
);
log_str
.
append
(
",
\"
blocking_txnid
\"
:"
);
log_str
.
append_ulonglong
(
blocking_txnid
);
...
...
@@ -1834,18 +1834,18 @@ static void tokudb_lock_timeout_callback(DB *db, uint64_t requesting_txnid, cons
String
key_str
;
tokudb_pretty_key
(
db
,
left_key
,
"?"
,
&
key_str
);
log_str
.
append
(
",
\"
key
\"
:"
);
log_str
.
append
(
key_str
);
log_str
.
append
(
"
\"
"
);
log_str
.
append
(
key_str
);
log_str
.
append
(
"
\"
"
);
}
else
{
String
left_str
;
tokudb_pretty_left_key
(
db
,
left_key
,
&
left_str
);
log_str
.
append
(
",
\"
key_left
\"
:
\"
"
);
log_str
.
append
(
left_str
);
log_str
.
append
(
",
\"
key_left
\"
:"
);
log_str
.
append
(
"
\"
"
);
log_str
.
append
(
left_str
);
log_str
.
append
(
"
\"
"
);
String
right_str
;
tokudb_pretty_right_key
(
db
,
right_key
,
&
right_str
);
log_str
.
append
(
"
\"
,
\"
key_right
\"
:
\"
"
);
log_str
.
append
(
right_str
);
log_str
.
append
(
"
,
\"
key_right
\"
:
"
);
log_str
.
append
(
"
\"
"
);
log_str
.
append
(
right_str
);
log_str
.
append
(
"
\"
"
);
}
log_str
.
append
(
"
\"
}"
);
log_str
.
append
(
"}"
);
// set last_lock_timeout
if
(
lock_timeout_debug
&
1
)
{
char
*
old_lock_timeout
=
THDVAR
(
thd
,
last_lock_timeout
);
...
...
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