diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-10-02 12:14:14 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-10-02 12:14:14 -0400 |
| commit | 227725479319ef02bcc96c2a534c1422d73a748c (patch) | |
| tree | 06aba5fcc04038a8d1f4ebe2448162a182f61a94 /storage | |
| parent | 841262a8048b939f568020f8af964609e56f0e1f (diff) | |
| download | mariadb-git-227725479319ef02bcc96c2a534c1422d73a748c.tar.gz | |
#90 set tokudb_last_lock_timeout to a string parsable by the python json module
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/hatoku_hton.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index 6db66fd84ae..7c23ac5a243 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -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); |