Commit dd47146d authored by Sergey Glukhov's avatar Sergey Glukhov
Browse files

added replacement of 'CARDINALITY' column values

parent de00650d

mysql-test/r/join.result

+2 −2
Original line number Diff line number Diff line
@@ -750,8 +750,8 @@ ERROR 42S22: Unknown column 't1.b' in 'on clause' 
select * from information_schema.statistics join information_schema.columns

using(table_name,column_name) where table_name='user';

TABLE_NAME	COLUMN_NAME	TABLE_CATALOG	TABLE_SCHEMA	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT	TABLE_CATALOG	TABLE_SCHEMA	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT

user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	NULL	NULL	NULL		BTREE		NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#	

user	User	NULL	mysql	0	mysql	PRIMARY	2	A	3	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	

user	Host	NULL	mysql	0	mysql	PRIMARY	1	A	#	NULL	NULL		BTREE		NULL	mysql	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		#	

user	User	NULL	mysql	0	mysql	PRIMARY	2	A	#	NULL	NULL		BTREE		NULL	mysql	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		#	

drop table t1;

drop table t2;

drop table t3;

mysql-test/t/join.test

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ select * from v1a join v1b on t1.b = t2.b; 
# Bug #17523 natural join and information_schema

#

# We mask out the Privileges column because it differs with embedded server

--replace_column 31 #

--replace_column 31 # 10 #

select * from information_schema.statistics join information_schema.columns

              using(table_name,column_name) where table_name='user';