2 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test
index b7c0dc53..ba5eea05 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41029.test
@@ -22,7 +22,7 @@ create table t1 (dummy int primary key, a int unique, b int) engine=innodb;
 insert into t1 values(1,1,1),(3,3,3),(5,5,5);
 commit;
 set session transaction isolation level repeatable read;
-select @@tx_isolation;
+select @@transaction_isolation;
 start transaction;
 select * from t1 where a > 2 for update;
 
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
index 9e8e5c4b..1feddeea 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
@@ -10,7 +10,6 @@ SET @saved_dbug = @@SESSION.debug_dbug;
 # Valgrind errors happen only with this:
 set session debug_dbug="+d,optimizer_innodb_icp";
 
-
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
@@ -20,8 +19,6 @@ set session debug_dbug="+d,optimizer_innodb_icp";
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
 
 DROP TABLE IF EXISTS `table5`;
 SET @saved_cs_client     = @@character_set_client;
@@ -239,8 +236,6 @@ UNLOCK TABLES;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
 
 #explain select * from `table5` where  (col2 <= '6566-06-15' AND (col24 < 'd' or col24 > 'd')  group by `col83` order by `col83` desc  ;