database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#20821 (INSERT DELAYED failes to write some rows to binlog):

Browse Source 
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:
  Result change.
mysql-test/t/rpl_insert.test:
  Reducing number of threads since it doesn't pass pushbuild.
sql/sql_insert.cc:
  Fixing typo and potential memory problem.
This commit is contained in:
unknown
2006-07-08 06:15:24 +02:00
parent 9d14c76427
commit a92e1c4aea
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/rpl_insert.result
View File

@ -9,8 +9,8 @@ USE mysqlslap;
CREATE TABLE t1 (id INT, name VARCHAR(64)); CREATE TABLE t1 (id INT, name VARCHAR(64));
SELECT COUNT(*) FROM mysqlslap.t1; SELECT COUNT(*) FROM mysqlslap.t1;
COUNT(*) COUNT(*)
20000 5000
SELECT COUNT(*) FROM mysqlslap.t1; SELECT COUNT(*) FROM mysqlslap.t1;
COUNT(*) COUNT(*)
20000 5000
DROP SCHEMA IF EXISTS mysqlslap; DROP SCHEMA IF EXISTS mysqlslap;

2
mysql-test/t/rpl_insert.test
View File

@ -15,7 +15,7 @@ USE mysqlslap;
CREATE TABLE t1 (id INT, name VARCHAR(64)); 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')"; 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 --sleep 10

6
sql/sql_insert.cc
View File

@ -1638,8 +1638,12 @@ write_delayed(THD *thd,TABLE *table, enum_duplicates duplic,
*/ */
if (query.str) 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; goto err;
query.str= str;
}
row= new delayed_row(query, duplic, ignore, log_on); row= new delayed_row(query, duplic, ignore, log_on);
if (row == NULL) if (row == NULL)
{ {