Commit e12d87e1 authored by unknown's avatar unknown
Browse files

bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)

two test results changed after the patch


mysql-test/r/grant.result:
  result fixed
mysql-test/r/type_ranges.result:
  result fixed
parent ee467d38
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ Db char(64) NO PRI
User	char(16)	NO	PRI		
Table_name	char(64)	NO	PRI		
Grantor	char(77)	NO	MUL		
Timestamp	timestamp	YES		CURRENT_TIMESTAMP	
Timestamp	timestamp	NO		CURRENT_TIMESTAMP	
Table_priv	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')	NO			
Column_priv	set('Select','Insert','Update','References')	NO			
use test;
+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ushort smallint(5) unsigned zerofill NULL NO MUL 00000 #
umedium	mediumint(8) unsigned	NULL	NO	MUL	0		#	
ulong	int(11) unsigned	NULL	NO	MUL	0		#	
ulonglong	bigint(13) unsigned	NULL	NO	MUL	0		#	
time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		#	
time_stamp	timestamp	NULL	NO		CURRENT_TIMESTAMP		#	
date_field	date	NULL	YES		NULL		#	
time_field	time	NULL	YES		NULL		#	
date_time	datetime	NULL	YES		NULL		#	
@@ -229,7 +229,7 @@ ushort smallint(5) unsigned zerofill NULL NO 00000 #
umedium	mediumint(8) unsigned	NULL	NO	MUL	0		#	
ulong	int(11) unsigned	NULL	NO	MUL	0		#	
ulonglong	bigint(13) unsigned	NULL	NO	MUL	0		#	
time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		#	
time_stamp	timestamp	NULL	NO		CURRENT_TIMESTAMP		#	
date_field	char(10)	latin1_swedish_ci	YES		NULL		#	
time_field	time	NULL	YES		NULL		#	
date_time	datetime	NULL	YES		NULL		#	
@@ -255,7 +255,7 @@ ushort smallint(5) unsigned zerofill NULL NO 00000 #
umedium	mediumint(8) unsigned	NULL	NO		0		#	
ulong	int(11) unsigned	NULL	NO		0		#	
ulonglong	bigint(13) unsigned	NULL	NO		0		#	
time_stamp	timestamp	NULL	YES		0000-00-00 00:00:00		#	
time_stamp	timestamp	NULL	NO		0000-00-00 00:00:00		#	
date_field	char(10)	latin1_swedish_ci	YES		NULL		#	
time_field	time	NULL	YES		NULL		#	
date_time	datetime	NULL	YES		NULL		#