10.0-base merge

1 files changed, 127 insertions, 132 deletions

diff --git a/mysql-test/suite/perfschema/r/nesting.result b/mysql-test/suite/perfschema/r/nesting.result
index a7b26b34776..cac92025a97 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -106,140 +106,135 @@ and (end_event_id <= @marker_end)
 ) all_events
 order by relative_event_id asc;
 relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	relative_nesting_event_id
-0	19	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	5	stage/sql/init	(stage)	STATEMENT	0
+0	18	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
+1	4	stage/sql/init	(stage)	STATEMENT	0
 2	2	wait/io/socket/sql/client_connection	recv	STAGE	1
 3	3	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	1
-4	4	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	1
-5	5	wait/io/file/sql/query_log	write	STAGE	1
-6	6	stage/sql/checking permissions	(stage)	STATEMENT	0
-7	7	stage/sql/Opening tables	(stage)	STATEMENT	0
-8	8	stage/sql/init	(stage)	STATEMENT	0
-9	9	stage/sql/optimizing	(stage)	STATEMENT	0
-10	12	stage/sql/executing	(stage)	STATEMENT	0
-11	11	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	10
-12	12	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	10
-13	13	stage/sql/end	(stage)	STATEMENT	0
-14	14	stage/sql/query end	(stage)	STATEMENT	0
-15	15	stage/sql/closing tables	(stage)	STATEMENT	0
-16	16	stage/sql/freeing items	(stage)	STATEMENT	0
-17	17	wait/io/socket/sql/client_connection	send	STATEMENT	0
-18	19	stage/sql/cleaning up	(stage)	STATEMENT	0
-19	19	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	18
-20	20	idle	idle	NULL	NULL
-21	40	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
-22	26	stage/sql/init	(stage)	STATEMENT	21
-23	23	wait/io/socket/sql/client_connection	recv	STAGE	22
-24	24	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	22
-25	25	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	22
-26	26	wait/io/file/sql/query_log	write	STAGE	22
-27	27	stage/sql/checking permissions	(stage)	STATEMENT	21
-28	28	stage/sql/Opening tables	(stage)	STATEMENT	21
-29	29	stage/sql/init	(stage)	STATEMENT	21
-30	30	stage/sql/optimizing	(stage)	STATEMENT	21
-31	33	stage/sql/executing	(stage)	STATEMENT	21
-32	32	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	31
-33	33	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	31
-34	34	stage/sql/end	(stage)	STATEMENT	21
-35	35	stage/sql/query end	(stage)	STATEMENT	21
-36	36	stage/sql/closing tables	(stage)	STATEMENT	21
-37	37	stage/sql/freeing items	(stage)	STATEMENT	21
-38	38	wait/io/socket/sql/client_connection	send	STATEMENT	21
-39	40	stage/sql/cleaning up	(stage)	STATEMENT	21
-40	40	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	39
-41	41	idle	idle	NULL	NULL
-42	61	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
-43	47	stage/sql/init	(stage)	STATEMENT	42
-44	44	wait/io/socket/sql/client_connection	recv	STAGE	43
-45	45	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	43
-46	46	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	43
-47	47	wait/io/file/sql/query_log	write	STAGE	43
-48	48	stage/sql/checking permissions	(stage)	STATEMENT	42
-49	49	stage/sql/Opening tables	(stage)	STATEMENT	42
-50	50	stage/sql/init	(stage)	STATEMENT	42
-51	51	stage/sql/optimizing	(stage)	STATEMENT	42
-52	54	stage/sql/executing	(stage)	STATEMENT	42
-53	53	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	52
-54	54	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	52
-55	55	stage/sql/end	(stage)	STATEMENT	42
-56	56	stage/sql/query end	(stage)	STATEMENT	42
-57	57	stage/sql/closing tables	(stage)	STATEMENT	42
-58	58	stage/sql/freeing items	(stage)	STATEMENT	42
-59	59	wait/io/socket/sql/client_connection	send	STATEMENT	42
-60	61	stage/sql/cleaning up	(stage)	STATEMENT	42
-61	61	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	60
-62	62	idle	idle	NULL	NULL
-63	80	statement/sql/select	select "This is the first part of a multi query" as payload;
+4	4	wait/io/file/sql/query_log	write	STAGE	1
+5	5	stage/sql/checking permissions	(stage)	STATEMENT	0
+6	6	stage/sql/Opening tables	(stage)	STATEMENT	0
+7	7	stage/sql/init	(stage)	STATEMENT	0
+8	8	stage/sql/optimizing	(stage)	STATEMENT	0
+9	11	stage/sql/executing	(stage)	STATEMENT	0
+10	10	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	9
+11	11	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	9
+12	12	stage/sql/end	(stage)	STATEMENT	0
+13	13	stage/sql/query end	(stage)	STATEMENT	0
+14	14	stage/sql/closing tables	(stage)	STATEMENT	0
+15	15	stage/sql/freeing items	(stage)	STATEMENT	0
+16	16	wait/io/socket/sql/client_connection	send	STATEMENT	0
+17	18	stage/sql/cleaning up	(stage)	STATEMENT	0
+18	18	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	17
+19	19	idle	idle	NULL	NULL
+20	38	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
+21	24	stage/sql/init	(stage)	STATEMENT	20
+22	22	wait/io/socket/sql/client_connection	recv	STAGE	21
+23	23	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	21
+24	24	wait/io/file/sql/query_log	write	STAGE	21
+25	25	stage/sql/checking permissions	(stage)	STATEMENT	20
+26	26	stage/sql/Opening tables	(stage)	STATEMENT	20
+27	27	stage/sql/init	(stage)	STATEMENT	20
+28	28	stage/sql/optimizing	(stage)	STATEMENT	20
+29	31	stage/sql/executing	(stage)	STATEMENT	20
+30	30	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	29
+31	31	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	29
+32	32	stage/sql/end	(stage)	STATEMENT	20
+33	33	stage/sql/query end	(stage)	STATEMENT	20
+34	34	stage/sql/closing tables	(stage)	STATEMENT	20
+35	35	stage/sql/freeing items	(stage)	STATEMENT	20
+36	36	wait/io/socket/sql/client_connection	send	STATEMENT	20
+37	38	stage/sql/cleaning up	(stage)	STATEMENT	20
+38	38	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	37
+39	39	idle	idle	NULL	NULL
+40	58	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
+41	44	stage/sql/init	(stage)	STATEMENT	40
+42	42	wait/io/socket/sql/client_connection	recv	STAGE	41
+43	43	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	41
+44	44	wait/io/file/sql/query_log	write	STAGE	41
+45	45	stage/sql/checking permissions	(stage)	STATEMENT	40
+46	46	stage/sql/Opening tables	(stage)	STATEMENT	40
+47	47	stage/sql/init	(stage)	STATEMENT	40
+48	48	stage/sql/optimizing	(stage)	STATEMENT	40
+49	51	stage/sql/executing	(stage)	STATEMENT	40
+50	50	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	49
+51	51	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	49
+52	52	stage/sql/end	(stage)	STATEMENT	40
+53	53	stage/sql/query end	(stage)	STATEMENT	40
+54	54	stage/sql/closing tables	(stage)	STATEMENT	40
+55	55	stage/sql/freeing items	(stage)	STATEMENT	40
+56	56	wait/io/socket/sql/client_connection	send	STATEMENT	40
+57	58	stage/sql/cleaning up	(stage)	STATEMENT	40
+58	58	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	57
+59	59	idle	idle	NULL	NULL
+60	76	statement/sql/select	select "This is the first part of a multi query" as payload;
 select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-64	68	stage/sql/init	(stage)	STATEMENT	63
-65	65	wait/io/socket/sql/client_connection	recv	STAGE	64
-66	66	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	64
-67	67	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	64
-68	68	wait/io/file/sql/query_log	write	STAGE	64
-69	69	stage/sql/checking permissions	(stage)	STATEMENT	63
-70	70	stage/sql/Opening tables	(stage)	STATEMENT	63
-71	71	stage/sql/init	(stage)	STATEMENT	63
-72	72	stage/sql/optimizing	(stage)	STATEMENT	63
-73	75	stage/sql/executing	(stage)	STATEMENT	63
-74	74	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	73
-75	75	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	73
-76	76	stage/sql/end	(stage)	STATEMENT	63
-77	77	stage/sql/query end	(stage)	STATEMENT	63
-78	78	stage/sql/closing tables	(stage)	STATEMENT	63
-79	80	stage/sql/freeing items	(stage)	STATEMENT	63
-80	80	wait/io/socket/sql/client_connection	send	STAGE	79
-81	95	statement/sql/select	select "And this is the second part of a multi query" as payload;
+61	64	stage/sql/init	(stage)	STATEMENT	60
+62	62	wait/io/socket/sql/client_connection	recv	STAGE	61
+63	63	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	61
+64	64	wait/io/file/sql/query_log	write	STAGE	61
+65	65	stage/sql/checking permissions	(stage)	STATEMENT	60
+66	66	stage/sql/Opening tables	(stage)	STATEMENT	60
+67	67	stage/sql/init	(stage)	STATEMENT	60
+68	68	stage/sql/optimizing	(stage)	STATEMENT	60
+69	71	stage/sql/executing	(stage)	STATEMENT	60
+70	70	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	69
+71	71	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	69
+72	72	stage/sql/end	(stage)	STATEMENT	60
+73	73	stage/sql/query end	(stage)	STATEMENT	60
+74	74	stage/sql/closing tables	(stage)	STATEMENT	60
+75	76	stage/sql/freeing items	(stage)	STATEMENT	60
+76	76	wait/io/socket/sql/client_connection	send	STAGE	75
+77	91	statement/sql/select	select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-82	83	stage/sql/init	(stage)	STATEMENT	81
-83	83	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	82
-84	84	stage/sql/checking permissions	(stage)	STATEMENT	81
-85	85	stage/sql/Opening tables	(stage)	STATEMENT	81
-86	86	stage/sql/init	(stage)	STATEMENT	81
-87	87	stage/sql/optimizing	(stage)	STATEMENT	81
-88	90	stage/sql/executing	(stage)	STATEMENT	81
-89	89	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	88
-90	90	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	88
-91	91	stage/sql/end	(stage)	STATEMENT	81
-92	92	stage/sql/query end	(stage)	STATEMENT	81
-93	93	stage/sql/closing tables	(stage)	STATEMENT	81
-94	95	stage/sql/freeing items	(stage)	STATEMENT	81
-95	95	wait/io/socket/sql/client_connection	send	STAGE	94
-96	112	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
-97	98	stage/sql/init	(stage)	STATEMENT	96
-98	98	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	97
-99	99	stage/sql/checking permissions	(stage)	STATEMENT	96
-100	100	stage/sql/Opening tables	(stage)	STATEMENT	96
-101	101	stage/sql/init	(stage)	STATEMENT	96
-102	102	stage/sql/optimizing	(stage)	STATEMENT	96
-103	105	stage/sql/executing	(stage)	STATEMENT	96
-104	104	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	103
-105	105	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	103
-106	106	stage/sql/end	(stage)	STATEMENT	96
-107	107	stage/sql/query end	(stage)	STATEMENT	96
-108	108	stage/sql/closing tables	(stage)	STATEMENT	96
-109	109	stage/sql/freeing items	(stage)	STATEMENT	96
-110	110	wait/io/socket/sql/client_connection	send	STATEMENT	96
-111	112	stage/sql/cleaning up	(stage)	STATEMENT	96
-112	112	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	111
-113	113	idle	idle	NULL	NULL
-114	133	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
-115	119	stage/sql/init	(stage)	STATEMENT	114
-116	116	wait/io/socket/sql/client_connection	recv	STAGE	115
-117	117	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	115
-118	118	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	115
-119	119	wait/io/file/sql/query_log	write	STAGE	115
-120	120	stage/sql/checking permissions	(stage)	STATEMENT	114
-121	121	stage/sql/Opening tables	(stage)	STATEMENT	114
-122	122	stage/sql/init	(stage)	STATEMENT	114
-123	123	stage/sql/optimizing	(stage)	STATEMENT	114
-124	126	stage/sql/executing	(stage)	STATEMENT	114
-125	125	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	124
-126	126	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	124
-127	127	stage/sql/end	(stage)	STATEMENT	114
-128	128	stage/sql/query end	(stage)	STATEMENT	114
-129	129	stage/sql/closing tables	(stage)	STATEMENT	114
-130	130	stage/sql/freeing items	(stage)	STATEMENT	114
-131	131	wait/io/socket/sql/client_connection	send	STATEMENT	114
-132	133	stage/sql/cleaning up	(stage)	STATEMENT	114
-133	133	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	132
+78	79	stage/sql/init	(stage)	STATEMENT	77
+79	79	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	78
+80	80	stage/sql/checking permissions	(stage)	STATEMENT	77
+81	81	stage/sql/Opening tables	(stage)	STATEMENT	77
+82	82	stage/sql/init	(stage)	STATEMENT	77
+83	83	stage/sql/optimizing	(stage)	STATEMENT	77
+84	86	stage/sql/executing	(stage)	STATEMENT	77
+85	85	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	84
+86	86	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	84
+87	87	stage/sql/end	(stage)	STATEMENT	77
+88	88	stage/sql/query end	(stage)	STATEMENT	77
+89	89	stage/sql/closing tables	(stage)	STATEMENT	77
+90	91	stage/sql/freeing items	(stage)	STATEMENT	77
+91	91	wait/io/socket/sql/client_connection	send	STAGE	90
+92	108	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
+93	94	stage/sql/init	(stage)	STATEMENT	92
+94	94	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	93
+95	95	stage/sql/checking permissions	(stage)	STATEMENT	92
+96	96	stage/sql/Opening tables	(stage)	STATEMENT	92
+97	97	stage/sql/init	(stage)	STATEMENT	92
+98	98	stage/sql/optimizing	(stage)	STATEMENT	92
+99	101	stage/sql/executing	(stage)	STATEMENT	92
+100	100	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	99
+101	101	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	99
+102	102	stage/sql/end	(stage)	STATEMENT	92
+103	103	stage/sql/query end	(stage)	STATEMENT	92
+104	104	stage/sql/closing tables	(stage)	STATEMENT	92
+105	105	stage/sql/freeing items	(stage)	STATEMENT	92
+106	106	wait/io/socket/sql/client_connection	send	STATEMENT	92
+107	108	stage/sql/cleaning up	(stage)	STATEMENT	92
+108	108	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	107
+109	109	idle	idle	NULL	NULL
+110	128	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
+111	114	stage/sql/init	(stage)	STATEMENT	110
+112	112	wait/io/socket/sql/client_connection	recv	STAGE	111
+113	113	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	111
+114	114	wait/io/file/sql/query_log	write	STAGE	111
+115	115	stage/sql/checking permissions	(stage)	STATEMENT	110
+116	116	stage/sql/Opening tables	(stage)	STATEMENT	110
+117	117	stage/sql/init	(stage)	STATEMENT	110
+118	118	stage/sql/optimizing	(stage)	STATEMENT	110
+119	121	stage/sql/executing	(stage)	STATEMENT	110
+120	120	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	119
+121	121	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	119
+122	122	stage/sql/end	(stage)	STATEMENT	110
+123	123	stage/sql/query end	(stage)	STATEMENT	110
+124	124	stage/sql/closing tables	(stage)	STATEMENT	110
+125	125	stage/sql/freeing items	(stage)	STATEMENT	110
+126	126	wait/io/socket/sql/client_connection	send	STATEMENT	110
+127	128	stage/sql/cleaning up	(stage)	STATEMENT	110
+128	128	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	127