summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_zip/t/4k.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/innodb_zip/t/4k.test')
-rw-r--r--mysql-test/suite/innodb_zip/t/4k.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb_zip/t/4k.test b/mysql-test/suite/innodb_zip/t/4k.test
index cdbed557e1d..73f21739342 100644
--- a/mysql-test/suite/innodb_zip/t/4k.test
+++ b/mysql-test/suite/innodb_zip/t/4k.test
@@ -19,7 +19,7 @@ SELECT variable_value FROM information_schema.global_status
--echo # Test 2) The number of buffer pool pages is dependent upon the page size.
--disable_warnings
---replace_result 6144 {checked_valid}
+--replace_result 2048 {checked_valid}
SELECT variable_value FROM information_schema.global_status
WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
--enable_warnings
@@ -285,9 +285,10 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c,
# But a single transaction can update the columns in separate statements.
# because the UNDO records will be smaller.
CREATE INDEX t1b ON t1 (b(767));
---error ER_UNDO_RECORD_TOO_BIG
+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,
@@ -302,8 +303,9 @@ UPDATE t1 SET c=@e;
# This is a problem. It means that the DDL is allowed to create a table
# that CANNOT be updated. See bug#12953735.
CREATE INDEX t1d ON t1 (d(767));
---error ER_UNDO_RECORD_TOO_BIG
+BEGIN;
UPDATE t1 SET d=@e;
+ROLLBACK;
--replace_regex /> [0-9]*/> max_row_size/
CREATE INDEX t1e ON t1 (e(767));