summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2006-06-23 19:36:54 +0400
committerunknown <evgen@moonbone.local>2006-06-23 19:36:54 +0400
commit907acc785da95878f0ff7eb6a5b88b5b18e713a8 (patch)
treeba5a9ed5b851fdf1d81bd8a97a41920dadfd4b68
parentcbc5f34c548fc824a9163310b2ec36e672b1b7c9 (diff)
downloadmariadb-git-907acc785da95878f0ff7eb6a5b88b5b18e713a8.tar.gz
key.result:
After merge fix mysql-test/r/key.result: After merge fix
-rw-r--r--mysql-test/r/key.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index 6c05a3dde8b..a6f05143b3e 100644
--- 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
-i2 int(11) UNI 0
+i1 int(11) NO UNI
+i2 int(11) NO UNI
drop table t1;
create table t1 (
c1 int,