diff --git a/mysql-test/r/innodb_bug42101.result b/mysql-test/r/innodb_bug42101.result
index 805097ffe9d..4e3367d5a54 100644
--- a/mysql-test/r/innodb_bug42101.result
+++ b/mysql-test/r/innodb_bug42101.result
@@ -3,12 +3,12 @@ select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
 set global innodb_commit_concurrency=1;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
 set global innodb_commit_concurrency=42;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '42'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
diff --git a/mysql-test/t/innodb_bug42101.test b/mysql-test/t/innodb_bug42101.test
index b6536490d48..f0b88e034a0 100644
--- a/mysql-test/t/innodb_bug42101.test
+++ b/mysql-test/t/innodb_bug42101.test
@@ -7,10 +7,10 @@
 
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
---error ER_WRONG_ARGUMENTS
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_commit_concurrency=1;
 select @@innodb_commit_concurrency;
---error ER_WRONG_ARGUMENTS
+--error ER_WRONG_VALUE_FOR_VAR
 set global innodb_commit_concurrency=42;
 select @@innodb_commit_concurrency;
 set global innodb_commit_concurrency=0;