diff --git a/mysql-test/r/rpl_insert.result b/mysql-test/r/rpl_insert.result
index b0c44be017f..bcc9b176ed3 100644
--- a/mysql-test/r/rpl_insert.result
+++ b/mysql-test/r/rpl_insert.result
@@ -9,8 +9,8 @@ USE mysqlslap;
 CREATE TABLE t1 (id INT, name VARCHAR(64));
 SELECT COUNT(*) FROM mysqlslap.t1;
 COUNT(*)
-20000
+5000
 SELECT COUNT(*) FROM mysqlslap.t1;
 COUNT(*)
-20000
+5000
 DROP SCHEMA IF EXISTS mysqlslap;
diff --git a/mysql-test/t/rpl_insert.test b/mysql-test/t/rpl_insert.test
index 1b67736dd72..9225606c94b 100644
--- a/mysql-test/t/rpl_insert.test
+++ b/mysql-test/t/rpl_insert.test
@@ -15,7 +15,7 @@ USE mysqlslap;
 CREATE TABLE t1 (id INT, name VARCHAR(64));
 
 let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With Love'), (3, 'Goldfinger'), (4, 'Thunderball'), (5, 'You Only Live Twice')";
---exec $MYSQL_SLAP --silent --concurrency=20 --iterations=200 --query=$query --delimiter=";"
+--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=200 --query=$query --delimiter=";"
 
 --sleep 10
 
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 2ec2555d6fc..ceeb4f6fdf8 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1638,8 +1638,12 @@ write_delayed(THD *thd,TABLE *table, enum_duplicates duplic,
    */
 
   if (query.str)
-    if (!(query.str= my_strndup(query.str, MYF(MY_WME), query.length)))
+  {
+    char *str;
+    if (!(str= my_strndup(query.str, query.length, MYF(MY_WME))))
       goto err;
+    query.str= str;
+  }
   row= new delayed_row(query, duplic, ignore, log_on);
   if (row == NULL)
   {