bk commit into 5.1 tree (mats:1.2241) BUG#20821

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-08 06:15:24+02:00, mats@romeo.(none) +3 -0
  BUG#20821 (INSERT DELAYED failes to write some rows to binlog):
  Fixing typo and potential memory problem.
  Reducing number of concurrent mysqlslap threads since tests fail
  in pushbuild due to too many threads.

  mysql-test/r/rpl_insert.result@stripped, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +2 -2
    Result change.

  mysql-test/t/rpl_insert.test@stripped, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +1 -1
    Reducing number of threads since it doesn't pass pushbuild.

  sql/sql_insert.cc@stripped, 2006-07-08 06:15:21+02:00, mats@romeo.(none) +5 -1
    Fixing typo and potential memory problem.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b20821-mysql-5.1-new-rpl

--- 1.208/sql/sql_insert.cc	2006-07-08 06:15:32 +02:00
+++ 1.209/sql/sql_insert.cc	2006-07-08 06:15:32 +02:00
@@ -1638,8 +1638,12 @@
    */
 
   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)
   {

--- 1.1/mysql-test/r/rpl_insert.result	2006-07-08 06:15:32 +02:00
+++ 1.2/mysql-test/r/rpl_insert.result	2006-07-08 06:15:32 +02:00
@@ -9,8 +9,8 @@
 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;

--- 1.3/mysql-test/t/rpl_insert.test	2006-07-08 06:15:32 +02:00
+++ 1.4/mysql-test/t/rpl_insert.test	2006-07-08 06:15:32 +02:00
@@ -15,7 +15,7 @@
 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