Merge pull request #46 from markdmatthews/development

Adding transaction start, age, rows locked and modified to the locks vie...

Author: MarkLeith

views/i_s/innodb_lock_waits.sql

@@ -23,21 +23,29 @@
 --
 -- mysql> SELECT * FROM x$innodb_lock_waits\G
 -- *************************** 1. row ***************************
---       wait_started: 2014-11-11 13:39:20
---           wait_age: 00:00:07
---       locked_table: `db1`.`t1`
---       locked_index: PRIMARY
---        locked_type: RECORD
---     waiting_trx_id: 867158
---        waiting_pid: 3
+--               wait_started: 2014-11-11 13:39:20
+--                   wait_age: 00:00:07
+--               locked_table: `db1`.`t1`
+--               locked_index: PRIMARY
+--                locked_type: RECORD
+--             waiting_trx_id: 867158
+--        waiting_trx_started: 2014-11-11 13:39:15
+--            waiting_trx_age: 00:00:12
+--    waiting_trx_rows_locked: 0
+--  waiting_trx_rows_modified: 0
+--                waiting_pid: 3
 --      waiting_query: UPDATE t1 SET val = val + 1 WHERE id = 2
---    waiting_lock_id: 867158:2363:3:3
---  waiting_lock_mode: X
---    blocking_trx_id: 867157
---       blocking_pid: 4
---     blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
---   blocking_lock_id: 867157:2363:3:3
--- blocking_lock_mode: X
+--            waiting_lock_id: 867158:2363:3:3
+--          waiting_lock_mode: X
+--            blocking_trx_id: 867157
+--               blocking_pid: 4
+--             blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
+--           blocking_lock_id: 867157:2363:3:3
+--         blocking_lock_mode: X
+--       blocking_trx_started: 2014-11-11 13:39:11
+--           blocking_trx_age: 00:00:16
+--   blocking_trx_rows_locked: 1
+-- blocking_trx_rows_modified: 1
 -- 1 row in set (0.01 sec)
 --
 
@@ -52,6 +60,10 @@ VIEW innodb_lock_waits (
   locked_index,
   locked_type,
   waiting_trx_id,
+  waiting_trx_started,
+  waiting_trx_age,
+  waiting_trx_rows_locked,
+  waiting_trx_rows_modified,
   waiting_pid,
   waiting_query,
   waiting_lock_id,
@@ -60,13 +72,21 @@ VIEW innodb_lock_waits (
   blocking_pid,
   blocking_query,
   blocking_lock_id,
-  blocking_lock_mode
+  blocking_lock_mode,
+  blocking_trx_started,
+  blocking_trx_age,
+  blocking_trx_rows_locked,
+  blocking_trx_rows_modified
 ) AS
 SELECT r.trx_wait_started AS wait_started, TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,
        rl.lock_table AS locked_table,
        rl.lock_index AS locked_index,
        rl.lock_type AS locked_type,
        r.trx_id AS waiting_trx_id,
+       r.trx_started as waiting_trx_started,
+       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,
+       r.trx_rows_locked AS waiting_trx_rows_locked,
+       r.trx_rows_modified AS waiting_trx_rows_modified,
        r.trx_mysql_thread_id AS waiting_pid,
        sys.format_statement(r.trx_query) AS waiting_query,
        rl.lock_id AS waiting_lock_id,
@@ -75,7 +95,11 @@ SELECT r.trx_wait_started AS wait_started, TIMEDIFF(NOW(), r.trx_wait_started) A
        b.trx_mysql_thread_id AS blocking_pid,
        sys.format_statement(b.trx_query) AS blocking_query,
        bl.lock_id AS blocking_lock_id,
-       bl.lock_mode AS blocking_lock_mode
+       bl.lock_mode AS blocking_lock_mode,
+       b.trx_started AS blocking_trx_started,
+       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,
+       b.trx_rows_locked AS blocking_trx_rows_locked,
+       b.trx_rows_modified AS blocking_trx_rows_modified
   FROM information_schema.innodb_lock_waits w
        INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id
        INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id

views/i_s/x_innodb_lock_waits.sql

@@ -23,21 +23,29 @@
 --
 -- mysql> SELECT * FROM x$innodb_lock_waits\G
 -- *************************** 1. row ***************************
---       wait_started: 2014-11-11 13:39:20
---           wait_age: 00:00:07
---       locked_table: `db1`.`t1`
---       locked_index: PRIMARY
---        locked_type: RECORD
---     waiting_trx_id: 867158
---        waiting_pid: 3
---      waiting_query: UPDATE t1 SET val = val + 1 WHERE id = 2
---    waiting_lock_id: 867158:2363:3:3
---  waiting_lock_mode: X
---    blocking_trx_id: 867157
---       blocking_pid: 4
---     blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
---   blocking_lock_id: 867157:2363:3:3
--- blocking_lock_mode: X
+--               wait_started: 2014-11-11 13:39:20
+--                   wait_age: 00:00:07
+--               locked_table: `db1`.`t1`
+--               locked_index: PRIMARY
+--                locked_type: RECORD
+--             waiting_trx_id: 867158
+--        waiting_trx_started: 2014-11-11 13:39:15
+--            waiting_trx_age: 00:00:12
+--    waiting_trx_rows_locked: 0
+--  waiting_trx_rows_modified: 0
+--                waiting_pid: 3
+--              waiting_query: UPDATE t1 SET val = val + 1 WHERE id = 2
+--            waiting_lock_id: 867158:2363:3:3
+--          waiting_lock_mode: X
+--            blocking_trx_id: 867157
+--               blocking_pid: 4
+--             blocking_query: UPDATE t1 SET val = val + 1 + SLEEP(10) WHERE id = 2
+--           blocking_lock_id: 867157:2363:3:3
+--         blocking_lock_mode: X
+--       blocking_trx_started: 2014-11-11 13:39:11
+--           blocking_trx_age: 00:00:16
+--   blocking_trx_rows_locked: 1
+-- blocking_trx_rows_modified: 1
 -- 1 row in set (0.01 sec)
 --
 
@@ -52,6 +60,10 @@ VIEW x$innodb_lock_waits (
   locked_index,
   locked_type,
   waiting_trx_id,
+  waiting_trx_started,
+  waiting_trx_age,
+  waiting_trx_rows_locked,
+  waiting_trx_rows_modified,
   waiting_pid,
   waiting_query,
   waiting_lock_id,
@@ -60,13 +72,21 @@ VIEW x$innodb_lock_waits (
   blocking_pid,
   blocking_query,
   blocking_lock_id,
-  blocking_lock_mode
+  blocking_lock_mode,
+  blocking_trx_started,
+  blocking_trx_age,
+  blocking_trx_rows_locked,
+  blocking_trx_rows_modified
 ) AS
 SELECT r.trx_wait_started AS wait_started, TIMEDIFF(NOW(), r.trx_wait_started) AS wait_age,
        rl.lock_table AS locked_table,
        rl.lock_index AS locked_index,
        rl.lock_type AS locked_type,
        r.trx_id AS waiting_trx_id,
+       r.trx_started as waiting_trx_started,
+       TIMEDIFF(NOW(), r.trx_started) AS waiting_trx_age,
+       r.trx_rows_locked AS waiting_trx_rows_locked,
+       r.trx_rows_modified AS waiting_trx_rows_modified,
        r.trx_mysql_thread_id AS waiting_pid,
        r.trx_query AS waiting_query,
        rl.lock_id AS waiting_lock_id,
@@ -75,7 +95,11 @@ SELECT r.trx_wait_started AS wait_started, TIMEDIFF(NOW(), r.trx_wait_started) A
        b.trx_mysql_thread_id AS blocking_pid,
        b.trx_query AS blocking_query,
        bl.lock_id AS blocking_lock_id,
-       bl.lock_mode AS blocking_lock_mode
+       bl.lock_mode AS blocking_lock_mode,
+       b.trx_started AS blocking_trx_started,
+       TIMEDIFF(NOW(), b.trx_started) AS blocking_trx_age,
+       b.trx_rows_locked AS blocking_trx_rows_locked,
+       b.trx_rows_modified AS blocking_trx_rows_modified
   FROM information_schema.innodb_lock_waits w
        INNER JOIN information_schema.innodb_trx b    ON b.trx_id = w.blocking_trx_id
        INNER JOIN information_schema.innodb_trx r    ON r.trx_id = w.requesting_trx_id