fixup! 9967583

Author: dr-m

mysql-test/suite/innodb/r/log_file_size_online.result

@@ -27,13 +27,10 @@ SET GLOBAL innodb_log_file_buffering=@save;
 SET GLOBAL innodb_log_file_mmap=OFF;
 Got one of the listed errors
 connect con1,localhost,root;
-SET GLOBAL innodb_log_file_size=16777216;
+SET GLOBAL innodb_log_file_size=7340032;
 connection default;
 SET GLOBAL innodb_log_archive=ON;
-ERROR HY000: SET GLOBAL innodb_log_file_size is in progress
-SELECT @@GLOBAL.innodb_log_archive;
-@@GLOBAL.innodb_log_archive
-0
+SET GLOBAL innodb_log_archive=OFF;
 KILL QUERY @id;
 connection con1;
 SET GLOBAL innodb_log_archive=ON, innodb_log_file_size=10485760;

mysql-test/suite/innodb/t/log_file_size_online.test

@@ -45,16 +45,16 @@ SET GLOBAL innodb_log_file_mmap=OFF;
 
 --connect con1,localhost,root
 let $ID= `SELECT @id := CONNECTION_ID()`;
-send SET GLOBAL innodb_log_file_size=16777216;
+send SET GLOBAL innodb_log_file_size=7340032;
 --connection default
 let $ignore= `SELECT @id := $ID`;
 let $wait_condition=
 select count(*)=1 from information_schema.processlist
-where id=@id and info like 'SET GLOBAL innodb_log_file_size=16777216';
+where id=@id and info like 'SET GLOBAL innodb_log_file_size=7340032';
 --source include/wait_condition.inc
---error ER_WRONG_USAGE
+--error 0,ER_WRONG_USAGE
 SET GLOBAL innodb_log_archive=ON;
-SELECT @@GLOBAL.innodb_log_archive;
+SET GLOBAL innodb_log_archive=OFF;
 
 KILL QUERY @id;
 --connection con1