Post-merge fix.

mysql-test/r/multi_update.result

@@ -364,8 +364,8 @@ select 't1 rows after big delete', count(*) from t1;
 t1 rows after big delete	count(*)
 t1 rows after big delete	1900001
 drop table t1,t2;
-set @ttype_save=@@table_type;
-set @@table_type=innodb;
+set @ttype_save=@@storage_engine;
+set @@storage_engine=innodb;
 create table t1 ( c char(8) not null );
 insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
 insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
@@ -377,7 +377,7 @@ create table t2 like t1;
 insert into t2 select * from t1;
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
 drop table t1,t2;
-set @@table_type=bdb;
+set @@storage_engine=bdb;
 create table t1 ( c char(8) not null );
 insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9');
 insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F');
@@ -388,5 +388,5 @@ update t1 set a=c, b=c;
 create table t2 like t1;
 insert into t2 select * from t1;
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
-set @@table_type=@ttype_save;
+set @@storage_engine=@ttype_save;
 drop table t1,t2;

mysql-test/t/multi_update.test

@@ -314,10 +314,10 @@ drop table t1,t2;
 #
 # Test for bug #1980.
 #
-set @ttype_save=@@table_type;
+set @ttype_save=@@storage_engine;
 
 --disable_warnings
-set @@table_type=innodb;
+set @@storage_engine=innodb;
 create table t1 ( c char(8) not null );
 --enable_warnings
 
@@ -337,7 +337,7 @@ delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
 drop table t1,t2;
 
 --disable_warnings
-set @@table_type=bdb;
+set @@storage_engine=bdb;
 create table t1 ( c char(8) not null );
 --enable_warnings
 
@@ -354,5 +354,5 @@ insert into t2 select * from t1;
 
 delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b;
 
-set @@table_type=@ttype_save;
+set @@storage_engine=@ttype_save;
 drop table t1,t2;