FB8-80: Display row information in processlist for rbr threads (#953)

Summary:
Jira ticket: https://jira.percona.com/browse/FB8-80

Reference Patch: 564824a

Set row_query using the fields unpacked from the row event. Use row_query in show processlist.
Pull Request resolved: #953

Reviewed By: lth

Differential Revision: D14137212

Pulled By: lth

fbshipit-source-id: ba5ad2d

mysql-test/suite/rpl/r/rpl_invalid_mem_access_with_rows_query_log_event.result

@@ -31,7 +31,7 @@ INSERT INTO t1 VALUES(1);
 SET DEBUG_SYNC= "now WAIT_FOR deleted_rows_query_ev";
 SELECT state,info FROM information_schema.processlist WHERE state like 'debug%';;
 state	debug sync point: now
-info	NULL
+info	INSERT INTO test.t1 (1)
 SET DEBUG_SYNC = "now SIGNAL go_ahead";
 #
 # Step 6) Cleanup

mysql-test/suite/rpl/r/rpl_multi_source_row_stages.result

@@ -44,36 +44,36 @@ Commit;
 check on channel_1
 include/start_slave_sql.inc [FOR CHANNEL 'channel_1']
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO t1 VALUES (1)", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO test.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE t1 SET a= 2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE test.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM t1 WHERE a=2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM test.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 check on channel_3
 include/start_slave_sql.inc [FOR CHANNEL 'channel_3']
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO t1 VALUES (1)", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=test, info LIKE "INSERT INTO test.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "INSERT INTO test.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE t1 SET a= 2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE t1 SET a= 2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=test, info LIKE "UPDATE test.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "UPDATE test.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM t1 WHERE a=2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
-[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM t1 WHERE a=2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=test, info LIKE "DELETE FROM test.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
+[SHOW PROCESSLIST reports: db=test, info LIKE "DELETE FROM test.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 # Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug
 [connection server_1]

mysql-test/suite/rpl/r/rpl_row_stages.result

@@ -20,19 +20,19 @@ COMMIT;
 # Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
 include/start_slave_sql.inc
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE t1 SET c1= 2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 [connection master]
 SET @@SESSION.BINLOG_ROWS_QUERY_LOG_EVENTS=0;
@@ -50,19 +50,19 @@ COMMIT;
 # Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
 include/start_slave_sql.inc
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info IS NULL, Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info IS NULL, Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info IS NULL, Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info IS NULL, command=Query]
-[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE 'NULL', command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
+[SHOW PROCESSLIST reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 # Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug
 [connection master]
@@ -80,22 +80,22 @@ AYzz6oU=
 BINLOG 'mSKWVhMBAAAAMgAAAOYCAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAfg9wnk=mSKWVh4BAAAAKAAAAA4DAAAAAPAAAAAAAAEAAgAB//4BAAAAnirPSw==';
 [connection master]
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "BINLOG %", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "INSERT INTO db_wl7364.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 [connection master1]
 BINLOG 'mSKWVhMBAAAAMgAAAGsDAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAWFoKHE=mSKWVh8BAAAALgAAAJkDAAAAAPAAAAAAAAEAAgAB///+AQAAAP4CAAAAuiHqhw==';
 [connection master]
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "BINLOG %", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "UPDATE db_wl7364.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 [connection master1]
 BINLOG 'mSKWVhMBAAAAMgAAAPwDAAAAAPAAAAAAAAEACWRiX3dsNzM2NAACdDEAAQMAAd+b01A=mSKWViABAAAAKAAAACQEAAAAAPAAAAAAAAEAAgAB//4CAAAAN7fZXg== ';
 [connection master]
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "BINLOG %", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "BINLOG %", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db_wl7364, info LIKE "DELETE FROM db_wl7364.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 [connection master1]
 COMMIT;
@@ -220,19 +220,19 @@ COMMIT;
 # Adding debug point 'dbug.rpl_apply_sync_barrier' to @@GLOBAL.debug
 include/start_slave_sql.inc
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db2, info LIKE "INSERT INTO t1 VALUES (1)", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
-[SHOW PROCESSLIST reports: db=db2, info LIKE "INSERT INTO t1 VALUES (1)", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (write), db=db2, info LIKE "INSERT INTO db2.t1 (1)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "INSERT INTO db2.t1 (1)", command=Query]
+[SHOW PROCESSLIST reports: db=db2, info LIKE "INSERT INTO db2.t1 (1)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db2, info LIKE "UPDATE t1 SET c1= 2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "UPDATE t1 SET c1= 2", command=Query]
-[SHOW PROCESSLIST reports: db=db2, info LIKE "UPDATE t1 SET c1= 2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (update), db=db2, info LIKE "UPDATE db2.t1 (1)(2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "UPDATE db2.t1 (1)(2)", command=Query]
+[SHOW PROCESSLIST reports: db=db2, info LIKE "UPDATE db2.t1 (1)(2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 SET debug_sync= 'now WAIT_FOR signal.rpl_row_apply_progress_updated';
-include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", Query]
-include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
-[SHOW PROCESSLIST reports: db=db2, info LIKE "DELETE FROM t1 WHERE c1=2", command=Query]
+include/assert.inc [PERFORMANCE_SCHEMA.threads reports: state=Applying batch of row changes (delete), db=db2, info LIKE "DELETE FROM db2.t1 (2)", Query]
+include/assert.inc [INFORMATION_SCHEMA.processlist reports: db=db2, info LIKE "DELETE FROM db2.t1 (2)", command=Query]
+[SHOW PROCESSLIST reports: db=db2, info LIKE "DELETE FROM db2.t1 (2)", command=Query]
 SET debug_sync= 'now SIGNAL signal.rpl_row_apply_process_next_row';
 [connection slave]
 # Removing debug point 'dbug.rpl_apply_sync_barrier' from @@GLOBAL.debug

mysql-test/suite/rpl/t/rpl_multi_source_row_stages.test

@@ -114,17 +114,17 @@ while ($j)
     if ($i == 3)
     {
       --let $state_progress= Applying batch of row changes (write)
-      --let $info= INSERT INTO t1 VALUES (1)
+      --let $info= INSERT INTO test.t1 (1)
     }
     if ($i == 2)
     {
       --let $state_progress= Applying batch of row changes (update)
-      --let $info= UPDATE t1 SET a= 2
+      --let $info= UPDATE test.t1 (1)(2)
     }
     if ($i == 1)
     {
       --let $state_progress= Applying batch of row changes (delete)
-      --let $info= DELETE FROM t1 WHERE a=2
+      --let $info= DELETE FROM test.t1 (2)
     }
 
     # this session waits for the progress to be updated