wl#9819 Version 2. Patch #9: mtr test

Author: jdduncan

mysql-test/suite/ndb/r/ndbinfo.result

@@ -1651,58 +1651,53 @@ Field	Type	Null	Key	Default	Extra
 reporting_node_id	int(10) unsigned	YES		NULL	
 node_id	int(10) unsigned	YES		NULL	
 node_type	int(10) unsigned	YES		NULL	
-host_addr	varchar(512)	YES		NULL	
 node_version	varchar(512)	YES		NULL	
 process_id	int(10) unsigned	YES		NULL	
 angel_process_id	int(10) unsigned	YES		NULL	
 process_name	varchar(512)	YES		NULL	
-connection_name	varchar(512)	YES		NULL	
-application_port	int(10) unsigned	YES		NULL	
+service_URI	varchar(512)	YES		NULL	
 show create table processes;
 View	Create View	character_set_client	collation_connection
-processes	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `processes` AS select distinct `ndb$processes`.`node_id` AS `node_id`,(case `ndb$processes`.`node_type` when 0 then 'NDB' when 1 then 'API' when 2 then 'MGM' else NULL end) AS `node_type`,`ndb$processes`.`host_addr` AS `host_addr`,`ndb$processes`.`node_version` AS `node_version`,nullif(`ndb$processes`.`process_id`,0) AS `process_id`,nullif(`ndb$processes`.`angel_process_id`,0) AS `angel_process_id`,`ndb$processes`.`process_name` AS `process_name`,`ndb$processes`.`connection_name` AS `connection_name`,nullif(`ndb$processes`.`application_port`,0) AS `application_port` from `ndb$processes`	latin1	latin1_swedish_ci
+processes	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `processes` AS select distinct `ndb$processes`.`node_id` AS `node_id`,(case `ndb$processes`.`node_type` when 0 then 'NDB' when 1 then 'API' when 2 then 'MGM' else NULL end) AS `node_type`,`ndb$processes`.`node_version` AS `node_version`,nullif(`ndb$processes`.`process_id`,0) AS `process_id`,nullif(`ndb$processes`.`angel_process_id`,0) AS `angel_process_id`,`ndb$processes`.`process_name` AS `process_name`,`ndb$processes`.`service_URI` AS `service_URI` from `ndb$processes` order by `ndb$processes`.`node_id`	latin1	latin1_swedish_ci
 
-SELECT reporting_node_id, node_id, node_type, process_name, connection_name
+SELECT reporting_node_id, node_id, node_type, process_name
 FROM ndb$processes
 ORDER BY reporting_node_id, node_id;
-reporting_node_id	node_id	node_type	process_name	connection_name
-1	1	0	ndbmtd	
-1	3	2	ndb_mgmd	
-1	16	1	mysqld	mysqld --server-id=2
-1	32	1	mysqld	mysqld --server-id=2 (connection 2)
-1	48	1	mysqld	mysqld --server-id=2 (connection 3)
-1	49	1	mysqld	mysqld --server-id=1
-1	63	1	mysqld	mysqld --server-id=1 (connection 2)
-1	127	1	mysqld	mysqld --server-id=1 (connection 3)
-2	2	0	ndbmtd	
-2	3	2	ndb_mgmd	
-2	16	1	mysqld	mysqld --server-id=2
-2	32	1	mysqld	mysqld --server-id=2 (connection 2)
-2	48	1	mysqld	mysqld --server-id=2 (connection 3)
-2	49	1	mysqld	mysqld --server-id=1
-2	63	1	mysqld	mysqld --server-id=1 (connection 2)
-2	127	1	mysqld	mysqld --server-id=1 (connection 3)
+reporting_node_id	node_id	node_type	process_name
+1	1	0	ndbmtd
+1	3	2	ndb_mgmd
+1	16	1	mysqld
+1	32	1	mysqld
+1	48	1	mysqld
+1	49	1	mysqld
+1	63	1	mysqld
+1	127	1	mysqld
+2	2	0	ndbmtd
+2	3	2	ndb_mgmd
+2	16	1	mysqld
+2	32	1	mysqld
+2	48	1	mysqld
+2	49	1	mysqld
+2	63	1	mysqld
+2	127	1	mysqld
 
 SELECT node_id,
 node_type,
 process_name,
 if(process_id is null, "null", "not_null") as proc_id,
-if(angel_process_id is null, "null", "not_null") as angel_proc_id,
-process_name,
-connection_name,
-if(application_port is null, "null", "not_null") as port
+if(angel_process_id is null, "null", "not_null") as angel_proc_id
 FROM processes
 ORDER BY node_id;
-node_id	node_type	process_name	proc_id	angel_proc_id	process_name	connection_name	port
-1	NDB	ndbmtd	not_null	not_null	ndbmtd		null
-2	NDB	ndbmtd	not_null	not_null	ndbmtd		null
-3	MGM	ndb_mgmd	not_null	null	ndb_mgmd		not_null
-16	API	mysqld	not_null	null	mysqld	mysqld --server-id=2	not_null
-32	API	mysqld	not_null	null	mysqld	mysqld --server-id=2 (connection 2)	not_null
-48	API	mysqld	not_null	null	mysqld	mysqld --server-id=2 (connection 3)	not_null
-49	API	mysqld	not_null	null	mysqld	mysqld --server-id=1	not_null
-63	API	mysqld	not_null	null	mysqld	mysqld --server-id=1 (connection 2)	not_null
-127	API	mysqld	not_null	null	mysqld	mysqld --server-id=1 (connection 3)	not_null
+node_id	node_type	process_name	proc_id	angel_proc_id
+1	NDB	ndbmtd	not_null	not_null
+2	NDB	ndbmtd	not_null	not_null
+3	MGM	ndb_mgmd	not_null	null
+16	API	mysqld	not_null	null
+32	API	mysqld	not_null	null
+48	API	mysqld	not_null	null
+49	API	mysqld	not_null	null
+63	API	mysqld	not_null	null
+127	API	mysqld	not_null	null
 
 desc ndb$config_nodes;
 Field	Type	Null	Key	Default	Extra

mysql-test/suite/ndb/t/ndbinfo.test

@@ -853,6 +853,8 @@ select node_id, concat(config_value / 1024 / 1024, 'M') as DataMemory
 #
 # wl#9819 ndbinfo.processes
 #
+# Because port number and host address vary in the test environment,
+# we can not test the content of the service_URI column.
 
 # (A) Normative tests of table and view definition
 desc ndb$processes;
@@ -863,7 +865,7 @@ show create table processes;
 # this test case changes.
 
 # Query the base table
-SELECT reporting_node_id, node_id, node_type, process_name, connection_name
+SELECT reporting_node_id, node_id, node_type, process_name
 FROM ndb$processes
 ORDER BY reporting_node_id, node_id;
 
@@ -872,10 +874,7 @@ SELECT node_id,
 node_type,
 process_name,
 if(process_id is null, "null", "not_null") as proc_id,
-if(angel_process_id is null, "null", "not_null") as angel_proc_id,
-process_name,
-connection_name,
-if(application_port is null, "null", "not_null") as port
+if(angel_process_id is null, "null", "not_null") as angel_proc_id
 FROM processes
 ORDER BY node_id;