1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-16k.test b/mysql-test/suite/innodb/t/innodb-16k.test
index a771fac27ed..a4f88f23457 100644
--- a/mysql-test/suite/innodb/t/innodb-16k.test
+++ b/mysql-test/suite/innodb/t/innodb-16k.test
@@ -324,10 +324,10 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c,
 # because the UNDO records will be smaller.
 
 CREATE INDEX t1f ON t1 (f(767));
---error 1713
+BEGIN;
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d,f=@d,g=@d,h=@d,i=@d,j=@d,
               k=@d,l=@d,m=@d,n=@d,o=@d,p=@d,q=@d,r=@d,s=@d,t=@d,u=@d;
-
+ROLLBACK;
 BEGIN;
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d;
 UPDATE t1 SET f=@d,g=@d,h=@d,i=@d,j=@d,k=@d,l=@d,m=@d,
@@ -367,8 +367,9 @@ UPDATE t1 SET s=@e;
 # that CANNOT be updated.
 
 CREATE INDEX t1t ON t1 (t(767));
---error 1713
+BEGIN;
 UPDATE t1 SET t=@e;
+ROLLBACK;
 
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
@@ -496,9 +497,10 @@ INSERT INTO bug12547647 VALUES (5,REPEAT('khdfo5AlOq',1900),REPEAT('g',7751));
 COMMIT;
 
 # The following used to cause a hang while doing infinite undo log allocation.
---error 1713
+BEGIN;
 UPDATE bug12547647 SET c = REPEAT('b',16928);
 SHOW WARNINGS;
+ROLLBACK;
 DROP TABLE bug12547647;
 
 SET SESSION innodb_strict_mode = on;