summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-13 19:06:14 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-13 19:06:14 +0200
commitc0de7ffcc83fb5192fda8ec1e47f20c417c5c374 (patch)
tree06519b8e0a8a16f795d98ca8a9c7861e6daaac04 /mysql-test
parent2d1e16eb04a3e78830447400a55f7cd2291e566c (diff)
downloadmariadb-git-c0de7ffcc83fb5192fda8ec1e47f20c417c5c374.tar.gz
Fixed problem with default & InnoDB tables.
Docs/manual.texi: ChangeLog
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/innodb.result2
-rw-r--r--mysql-test/t/innodb.test8
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 333bbc45196..a422f55767d 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -499,3 +499,5 @@ table type possible_keys key key_len ref rows Extra
t1 index NULL b 4 NULL 4 Using index
table type possible_keys key key_len ref rows Extra
t1 ALL NULL NULL NULL NULL 4
+Field Type Null Key Default Extra
+testint int(11) 1
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index f0e9f8cf72f..a962f120d4e 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -529,3 +529,11 @@ explain select a,b from t1 order by b;
explain select a,b from t1;
explain select a,b,c from t1;
drop table t1;
+
+#
+# Check describe
+#
+
+create table t1 (testint int not null default 1) type=innodb;
+desc t1;
+drop table t1;