update test results

mysql-test/suite/funcs_1/r/is_columns_mysql.result

@@ -253,7 +253,6 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	longblob	NULL	NULL
 1.0000	char	latin1	latin1_bin
 1.0000	char	latin1	latin1_swedish_ci
-1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	text	utf8	utf8_bin
 1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
@@ -287,7 +286,6 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
 NULL	datetime	NULL	NULL
 NULL	decimal	NULL	NULL
-NULL	float	NULL	NULL
 NULL	int	NULL	NULL
 NULL	smallint	NULL	NULL
 NULL	time	NULL	NULL

mysql-test/suite/funcs_1/r/is_key_column_usage.result

@@ -107,11 +107,8 @@ def	mysql	PRIMARY	def	mysql	innodb_index_stats	database_name
 def	mysql	PRIMARY	def	mysql	innodb_index_stats	table_name
 def	mysql	PRIMARY	def	mysql	innodb_index_stats	index_name
 def	mysql	PRIMARY	def	mysql	innodb_index_stats	stat_name
-def	mysql	innodb_index_stats_ibfk_1	def	mysql	innodb_index_stats	database_name
-def	mysql	innodb_index_stats_ibfk_1	def	mysql	innodb_index_stats	table_name
 def	mysql	PRIMARY	def	mysql	innodb_table_stats	database_name
 def	mysql	PRIMARY	def	mysql	innodb_table_stats	table_name
-def	mysql	PRIMARY	def	mysql	ndb_binlog_index	epoch
 def	mysql	PRIMARY	def	mysql	plugin	name
 def	mysql	PRIMARY	def	mysql	proc	db
 def	mysql	PRIMARY	def	mysql	proc	name
@@ -126,10 +123,6 @@ def	mysql	PRIMARY	def	mysql	proxies_priv	User
 def	mysql	PRIMARY	def	mysql	proxies_priv	Proxied_host
 def	mysql	PRIMARY	def	mysql	proxies_priv	Proxied_user
 def	mysql	PRIMARY	def	mysql	servers	Server_name
-def	mysql	PRIMARY	def	mysql	slave_master_info	Master_id
-def	mysql	PRIMARY	def	mysql	slave_relay_log_info	Master_id
-def	mysql	PRIMARY	def	mysql	slave_worker_info	Master_id
-def	mysql	PRIMARY	def	mysql	slave_worker_info	Worker_id
 def	mysql	PRIMARY	def	mysql	table_stats	db_name
 def	mysql	PRIMARY	def	mysql	table_stats	table_name
 def	mysql	PRIMARY	def	mysql	tables_priv	Host

mysql-test/suite/funcs_1/r/is_table_constraints.result

@@ -72,17 +72,12 @@ def	mysql	name	mysql	help_topic
 def	mysql	PRIMARY	mysql	host
 def	mysql	PRIMARY	mysql	index_stats
 def	mysql	PRIMARY	mysql	innodb_index_stats
-def	mysql	innodb_index_stats_ibfk_1	mysql	innodb_index_stats
 def	mysql	PRIMARY	mysql	innodb_table_stats
-def	mysql	PRIMARY	mysql	ndb_binlog_index
 def	mysql	PRIMARY	mysql	plugin
 def	mysql	PRIMARY	mysql	proc
 def	mysql	PRIMARY	mysql	procs_priv
 def	mysql	PRIMARY	mysql	proxies_priv
 def	mysql	PRIMARY	mysql	servers
-def	mysql	PRIMARY	mysql	slave_master_info
-def	mysql	PRIMARY	mysql	slave_relay_log_info
-def	mysql	PRIMARY	mysql	slave_worker_info
 def	mysql	PRIMARY	mysql	table_stats
 def	mysql	PRIMARY	mysql	tables_priv
 def	mysql	PRIMARY	mysql	time_zone

mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result

@@ -21,18 +21,13 @@ def	mysql	name	mysql	help_topic	UNIQUE
 def	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 def	mysql	PRIMARY	mysql	host	PRIMARY KEY
 def	mysql	PRIMARY	mysql	index_stats	PRIMARY KEY
-def	mysql	innodb_index_stats_ibfk_1	mysql	innodb_index_stats	FOREIGN KEY
 def	mysql	PRIMARY	mysql	innodb_index_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	innodb_table_stats	PRIMARY KEY
-def	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
 def	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 def	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	proxies_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	servers	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_master_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_relay_log_info	PRIMARY KEY
-def	mysql	PRIMARY	mysql	slave_worker_info	PRIMARY KEY
 def	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 def	mysql	PRIMARY	mysql	table_stats	PRIMARY KEY
 def	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY