Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges

mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable


client/mysqldump.c:
  mysqldump skips information_schema db
mysql-test/r/alter_table.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/create.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_collate.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_recoding.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_ujis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/drop.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_sapdb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_time.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/gis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/information_schema.result:
  Added couple of tests
mysql-test/r/information_schema_inno.result:
  Removed coulmn 'CONTRAINT_METOD' from TABLE_CONSTRAINTS
  Added column 'POSITION_IN_UNIQUE_CONSTRAINT' to KEY_COLUMN_USAGE
mysql-test/r/innodb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ndb_autodiscover.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ps_1general.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl000009.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl_create_database.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/schema.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/select.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/show_check.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/sp.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_enum.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_ranges.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/t/information_schema.test:
  Added couple of tests
sql/sql_acl.cc:
  Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
sql/sql_db.cc:
  'use' now can use information_schema db
sql/sql_show.cc:
  code cleanup
  informaton_schema(IS) db now contains data about IS itself
sql/sql_yacc.yy:
  A fix(wrong behavour of 'SHOW COLUMNS, SHOW KEYS' with 'where condition')

1 files changed, 58 insertions, 58 deletions

diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result
index ef4f65eda1f..1a66f0d91d2 100644
--- a/mysql-test/r/type_ranges.result
+++ b/mysql-test/r/type_ranges.result
@@ -40,30 +40,30 @@ KEY (options,flags)
 );
 show full fields from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	int(5) unsigned	NULL		PRI	NULL	auto_increment	select,insert,update,references	
+auto	int(5) unsigned	NULL	NO	PRI	NULL	auto_increment	select,insert,update,references	
 string	char(10)	latin1_swedish_ci	YES		hello		select,insert,update,references	
-tiny	tinyint(4)	NULL		MUL	0		select,insert,update,references	
-short	smallint(6)	NULL		MUL	1		select,insert,update,references	
-medium	mediumint(8)	NULL		MUL	0		select,insert,update,references	
-long_int	int(11)	NULL			0		select,insert,update,references	
-longlong	bigint(13)	NULL		MUL	0		select,insert,update,references	
-real_float	float(13,1)	NULL		MUL	0.0		select,insert,update,references	
+tiny	tinyint(4)	NULL	NO	MUL	0		select,insert,update,references	
+short	smallint(6)	NULL	NO	MUL	1		select,insert,update,references	
+medium	mediumint(8)	NULL	NO	MUL	0		select,insert,update,references	
+long_int	int(11)	NULL	NO		0		select,insert,update,references	
+longlong	bigint(13)	NULL	NO	MUL	0		select,insert,update,references	
+real_float	float(13,1)	NULL	NO	MUL	0.0		select,insert,update,references	
 real_double	double(16,4)	NULL	YES		NULL		select,insert,update,references	
-utiny	tinyint(3) unsigned	NULL		MUL	0		select,insert,update,references	
-ushort	smallint(5) unsigned zerofill	NULL		MUL	00000		select,insert,update,references	
-umedium	mediumint(8) unsigned	NULL		MUL	0		select,insert,update,references	
-ulong	int(11) unsigned	NULL		MUL	0		select,insert,update,references	
-ulonglong	bigint(13) unsigned	NULL		MUL	0		select,insert,update,references	
+utiny	tinyint(3) unsigned	NULL	NO	MUL	0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill	NULL	NO	MUL	00000		select,insert,update,references	
+umedium	mediumint(8) unsigned	NULL	NO	MUL	0		select,insert,update,references	
+ulong	int(11) unsigned	NULL	NO	MUL	0		select,insert,update,references	
+ulonglong	bigint(13) unsigned	NULL	NO	MUL	0		select,insert,update,references	
 time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		select,insert,update,references	
 date_field	date	NULL	YES		NULL		select,insert,update,references	
 time_field	time	NULL	YES		NULL		select,insert,update,references	
 date_time	datetime	NULL	YES		NULL		select,insert,update,references	
 blob_col	blob	NULL	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	NULL	YES		NULL		select,insert,update,references	
-mediumblob_col	mediumblob	NULL					select,insert,update,references	
-longblob_col	longblob	NULL					select,insert,update,references	
-options	enum('one','two','tree')	latin1_swedish_ci		MUL	one		select,insert,update,references	
-flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
+mediumblob_col	mediumblob	NULL	NO				select,insert,update,references	
+longblob_col	longblob	NULL	NO				select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci	NO	MUL	one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci	NO				select,insert,update,references	
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	auto	A	0	NULL	NULL		BTREE	
@@ -208,56 +208,56 @@ Warning	1265	Data truncated for column 'options' at row 6
 update t2 set string="changed" where auto=16;
 show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	int(5) unsigned	NULL		MUL	NULL	auto_increment	select,insert,update,references	
+auto	int(5) unsigned	NULL	NO	MUL	NULL	auto_increment	select,insert,update,references	
 string	char(10)	latin1_swedish_ci	YES		new defaul		select,insert,update,references	
-tiny	tinyint(4)	NULL		MUL	0		select,insert,update,references	
-short	smallint(6)	NULL		MUL	0		select,insert,update,references	
-medium	mediumint(8)	NULL		MUL	0		select,insert,update,references	
-long_int	int(11)	NULL			0		select,insert,update,references	
-longlong	bigint(13)	NULL		MUL	0		select,insert,update,references	
-real_float	float(13,1)	NULL		MUL	0.0		select,insert,update,references	
+tiny	tinyint(4)	NULL	NO	MUL	0		select,insert,update,references	
+short	smallint(6)	NULL	NO	MUL	0		select,insert,update,references	
+medium	mediumint(8)	NULL	NO	MUL	0		select,insert,update,references	
+long_int	int(11)	NULL	NO		0		select,insert,update,references	
+longlong	bigint(13)	NULL	NO	MUL	0		select,insert,update,references	
+real_float	float(13,1)	NULL	NO	MUL	0.0		select,insert,update,references	
 real_double	double(16,4)	NULL	YES		NULL		select,insert,update,references	
-utiny	tinyint(3) unsigned	NULL			0		select,insert,update,references	
-ushort	smallint(5) unsigned zerofill	NULL			00000		select,insert,update,references	
-umedium	mediumint(8) unsigned	NULL		MUL	0		select,insert,update,references	
-ulong	int(11) unsigned	NULL		MUL	0		select,insert,update,references	
-ulonglong	bigint(13) unsigned	NULL		MUL	0		select,insert,update,references	
+utiny	tinyint(3) unsigned	NULL	NO		0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill	NULL	NO		00000		select,insert,update,references	
+umedium	mediumint(8) unsigned	NULL	NO	MUL	0		select,insert,update,references	
+ulong	int(11) unsigned	NULL	NO	MUL	0		select,insert,update,references	
+ulonglong	bigint(13) unsigned	NULL	NO	MUL	0		select,insert,update,references	
 time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		select,insert,update,references	
 date_field	char(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 time_field	time	NULL	YES		NULL		select,insert,update,references	
 date_time	datetime	NULL	YES		NULL		select,insert,update,references	
 new_blob_col	varchar(20)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	NULL	YES		NULL		select,insert,update,references	
-mediumblob_col	mediumblob	NULL					select,insert,update,references	
-options	enum('one','two','tree')	latin1_swedish_ci		MUL	one		select,insert,update,references	
-flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
-new_field	char(10)	latin1_swedish_ci			new		select,insert,update,references	
+mediumblob_col	mediumblob	NULL	NO				select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci	NO	MUL	one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci	NO				select,insert,update,references	
+new_field	char(10)	latin1_swedish_ci	NO		new		select,insert,update,references	
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	int(5) unsigned	NULL			0		select,insert,update,references	
+auto	int(5) unsigned	NULL	NO		0		select,insert,update,references	
 string	char(10)	latin1_swedish_ci	YES		new defaul		select,insert,update,references	
-tiny	tinyint(4)	NULL			0		select,insert,update,references	
-short	smallint(6)	NULL			0		select,insert,update,references	
-medium	mediumint(8)	NULL			0		select,insert,update,references	
-long_int	int(11)	NULL			0		select,insert,update,references	
-longlong	bigint(13)	NULL			0		select,insert,update,references	
-real_float	float(13,1)	NULL			0.0		select,insert,update,references	
+tiny	tinyint(4)	NULL	NO		0		select,insert,update,references	
+short	smallint(6)	NULL	NO		0		select,insert,update,references	
+medium	mediumint(8)	NULL	NO		0		select,insert,update,references	
+long_int	int(11)	NULL	NO		0		select,insert,update,references	
+longlong	bigint(13)	NULL	NO		0		select,insert,update,references	
+real_float	float(13,1)	NULL	NO		0.0		select,insert,update,references	
 real_double	double(16,4)	NULL	YES		NULL		select,insert,update,references	
-utiny	tinyint(3) unsigned	NULL			0		select,insert,update,references	
-ushort	smallint(5) unsigned zerofill	NULL			00000		select,insert,update,references	
-umedium	mediumint(8) unsigned	NULL			0		select,insert,update,references	
-ulong	int(11) unsigned	NULL			0		select,insert,update,references	
-ulonglong	bigint(13) unsigned	NULL			0		select,insert,update,references	
+utiny	tinyint(3) unsigned	NULL	NO		0		select,insert,update,references	
+ushort	smallint(5) unsigned zerofill	NULL	NO		00000		select,insert,update,references	
+umedium	mediumint(8) unsigned	NULL	NO		0		select,insert,update,references	
+ulong	int(11) unsigned	NULL	NO		0		select,insert,update,references	
+ulonglong	bigint(13) unsigned	NULL	NO		0		select,insert,update,references	
 time_stamp	timestamp	NULL	YES		0000-00-00 00:00:00		select,insert,update,references	
 date_field	char(10)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 time_field	time	NULL	YES		NULL		select,insert,update,references	
 date_time	datetime	NULL	YES		NULL		select,insert,update,references	
 new_blob_col	varchar(20)	latin1_swedish_ci	YES		NULL		select,insert,update,references	
 tinyblob_col	tinyblob	NULL	YES		NULL		select,insert,update,references	
-mediumblob_col	mediumblob	NULL					select,insert,update,references	
-options	enum('one','two','tree')	latin1_swedish_ci			one		select,insert,update,references	
-flags	set('one','two','tree')	latin1_swedish_ci					select,insert,update,references	
-new_field	char(10)	latin1_swedish_ci			new		select,insert,update,references	
+mediumblob_col	mediumblob	NULL	NO				select,insert,update,references	
+options	enum('one','two','tree')	latin1_swedish_ci	NO		one		select,insert,update,references	
+flags	set('one','two','tree')	latin1_swedish_ci	NO				select,insert,update,references	
+new_field	char(10)	latin1_swedish_ci	NO		new		select,insert,update,references	
 select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null)));
 auto	auto
 16	16
@@ -268,15 +268,15 @@ drop table t2;
 create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	bigint(17) unsigned	NULL		PRI	0		select,insert,update,references	
-t1	bigint(1)	NULL			0		select,insert,update,references	
-t2	varchar(1)	latin1_swedish_ci					select,insert,update,references	
-t3	varchar(256)	latin1_swedish_ci					select,insert,update,references	
-t4	varbinary(256)	NULL					select,insert,update,references	
-t5	longtext	latin1_swedish_ci					select,insert,update,references	
-t6	longblob	NULL					select,insert,update,references	
-t7	char(0)	latin1_swedish_ci					select,insert,update,references	
-t8	binary(0)	NULL					select,insert,update,references	
+auto	bigint(17) unsigned	NULL	NO	PRI	0		select,insert,update,references	
+t1	bigint(1)	NULL	NO		0		select,insert,update,references	
+t2	varchar(1)	latin1_swedish_ci	NO				select,insert,update,references	
+t3	varchar(256)	latin1_swedish_ci	NO				select,insert,update,references	
+t4	varbinary(256)	NULL	NO				select,insert,update,references	
+t5	longtext	latin1_swedish_ci	NO				select,insert,update,references	
+t6	longblob	NULL	NO				select,insert,update,references	
+t7	char(0)	latin1_swedish_ci	NO				select,insert,update,references	
+t8	binary(0)	NULL	NO				select,insert,update,references	
 select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
 t1	t2	length(t3)	length(t4)	length(t5)	length(t6)	t7	t8
 1	a	256	256	4096	4096		
@@ -297,7 +297,7 @@ show full columns from t3;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 c1	int(11)	NULL	YES		NULL		select,insert,update,references	
 c2	int(11)	NULL	YES		NULL		select,insert,update,references	
-const	bigint(1)	NULL			0		select,insert,update,references	
+const	bigint(1)	NULL	NO		0		select,insert,update,references	
 drop table t1,t2,t3;
 create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield));
 drop table t1;