key.result:

After merge fix

key.result:
After merge fix
c74cc187 · evgen@moonbone.local · e74c47fb · c74cc187
Commit c74cc187 authored Jun 23, 2006 by evgen@moonbone.local
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/key.result mysql-test/r/key.result +2 -2

No files found.
--- a/mysql-test/r/key.result
+++ b/mysql-test/r/key.result
@@ -336,8 +336,8 @@ UNIQUE i1idx (i1),
 UNIQUE i2idx (i2));
 desc t1;
 Field	Type	Null	Key	Default	Extra
-i1	int(11)		UNI	0	
+i1	int(11)	NO	UNI		
-i2	int(11)		UNI	0	
+i2	int(11)	NO	UNI		
 drop table t1;
 create table t1 (
 c1 int,