diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-04 00:22:22 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-04 00:22:22 +0200 |
| commit | 00c36b694a2588839e2af51742e480da8cd78ecf (patch) | |
| tree | ef655784b48be8d9b7ad0be073bbee46c3f00a90 /mysql-test/t/multi_update.test | |
| parent | 54c80b5bd9e8e4023e79b20788d22eb114d8fe02 (diff) | |
| download | mariadb-git-00c36b694a2588839e2af51742e480da8cd78ecf.tar.gz | |
mysql-test/r/multi_update.result, mysql-test/t/multi_update.test
don't fail w/o bdb (or innodb)
sql/sql_base.cc
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
mysql-test/r/multi_update.result:
don't fail w/o bdb (or innodb)
mysql-test/t/multi_update.test:
don't fail w/o bdb (or innodb)
sql/sql_base.cc:
typo fixed.
"mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index de66218c4a6..bc82de50f6f 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -452,11 +452,8 @@ drop table t1, t2; # # Test for bug #1980. # -set @ttype_save=@@storage_engine; - --disable_warnings -set @@storage_engine=innodb; -create table t1 ( c char(8) not null ); +create table t1 ( c char(8) not null ) engine=innodb; --enable_warnings insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9'); @@ -475,8 +472,7 @@ delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; drop table t1,t2; --disable_warnings -set @@storage_engine=bdb; -create table t1 ( c char(8) not null ); +create table t1 ( c char(8) not null ) engine=bdb; --enable_warnings insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9'); @@ -492,7 +488,6 @@ insert into t2 select * from t1; delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; -set @@storage_engine=@ttype_save; drop table t1,t2; create table t1 (a int, b int); |