summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <dlenev@brandersnatch.localdomain>2005-03-16 18:48:13 +0300
committerunknown <dlenev@brandersnatch.localdomain>2005-03-16 18:48:13 +0300
commit01774e960b2c8998372d9b61515f8a1f5357847b (patch)
treef64d81094bcdfd956931df16d8afccb05ce59286 /mysql-test
parent05e25d047a460364e19e161a12a009684fac27de (diff)
downloadmariadb-git-01774e960b2c8998372d9b61515f8a1f5357847b.tar.gz
Small fix to innodb.test that Heikki probably simply forgot to commit.
mysql-test/r/innodb.result: Added proper cleanup after test. mysql-test/t/innodb.test: We don't expect error if we create varchar(16384) column in Innodb table anymore. (Heikki already removed error message from .result file.) Also we should do proper cleanup after the test.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/innodb.result1
-rw-r--r--mysql-test/t/innodb.test2
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 461cf269755..1c991478ab6 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1809,5 +1809,6 @@ show variables like "innodb_thread_sleep_delay";
Variable_name Value
innodb_thread_sleep_delay 10000
create table t1 (v varchar(16384)) engine=innodb;
+drop table t1;
create table t1 (a bit, key(a)) engine=innodb;
ERROR 42000: The storage engine for the table doesn't support BIT FIELD
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 91a2b5b0e54..057d326eb52 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -1291,8 +1291,8 @@ show variables like "innodb_thread_sleep_delay";
#eval set storage_engine=$default;
# InnoDB specific varchar tests
---error 1074
create table t1 (v varchar(16384)) engine=innodb;
+drop table t1;
# The following should be moved to type_bit.test when innodb will support it
--error 1178