MDEV-4865 Change related to --log option/variable was merged partially

Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)

1 files changed, 6 insertions, 19 deletions

diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result
index df7733a1cd3..85abcb0139d 100644
--- a/mysql-test/r/subselect4.result
+++ b/mysql-test/r/subselect4.result
@@ -425,20 +425,13 @@ PRIMARY KEY (`pk`),
 KEY `varchar_key` (`varchar_key`)
 ) AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
 INSERT INTO `t1` VALUES (10,'00:00:00','i','i'),(11,'00:00:00','','');
-set @old_optimizer_switch          = @@session.optimizer_switch,
-@old_engine_condition_pushdown = @@session.engine_condition_pushdown;
-SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on';
-SET SESSION engine_condition_pushdown = 1;
-Warnings:
-Warning	1287	'@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
+set @old_optimizer_switch          = @@session.optimizer_switch;
+SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on';
 SELECT `time_nokey` G1  FROM t1  WHERE ( `varchar_nokey`  , `varchar_key`  )  IN ( 
 SELECT `varchar_nokey`  , `varchar_nokey`  )  AND `varchar_key`  >= 'c' HAVING G1  ORDER 
 BY `pk`   ;
 G1
-set @@session.optimizer_switch          = @old_optimizer_switch,
-@@session.engine_condition_pushdown = @old_engine_condition_pushdown;
-Warnings:
-Warning	1287	'@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
+set @@session.optimizer_switch          = @old_optimizer_switch;
 DROP TABLE t1;
 #
 # During work with BUG#45863 I had problems with a query that was
@@ -620,12 +613,8 @@ PRIMARY KEY (pk)
 );
 INSERT INTO t2 VALUES (9,1);
 # Enable Index condition pushdown
-SELECT @old_icp:=@@engine_condition_pushdown;
-@old_icp:=@@engine_condition_pushdown
-#
-SET SESSION engine_condition_pushdown = 'ON';
-Warnings:
-Warning	1287	'@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
+set @old_icp=@@optimizer_switch;
+SET SESSION optimizer_switch="engine_condition_pushdown=on";
 
 SELECT pk
 FROM t2
@@ -638,9 +627,7 @@ ORDER BY t1.i2 desc);
 pk
 9
 # Restore old value for Index condition pushdown
-SET SESSION engine_condition_pushdown=@old_icp;
-Warnings:
-Warning	1287	'@@engine_condition_pushdown' is deprecated and will be removed in a future release. Please use '@@optimizer_switch' instead
+SET SESSION optimizer_switch=@old_icp;
 DROP TABLE t1,t2;
 #
 # End of 5.3 tests.