summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-12-13 13:17:19 -0700
committerunknown <sasha@mysql.sashanet.com>2001-12-13 13:17:19 -0700
commitf19819ee9d837d0997230c5ce4a2b3bbccb31788 (patch)
treebf4d31e683a20ee0723756ec9d0b6cca15833667 /mysql-test
parent9cbc19c8b49764d72c1e43ccd97f299c720b53ef (diff)
parentec2e031ac0b7dcaf2fa32c5a7f0706cc1865c2a7 (diff)
downloadmariadb-git-f19819ee9d837d0997230c5ce4a2b3bbccb31788.tar.gz
merged
sql/mysqld.cc: Auto merged
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;