summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-05 23:10:29 +0300
committermonty@hundin.mysql.fi <>2002-06-05 23:10:29 +0300
commit9263b77e0c48a457cd097892b98fc00cba20dc15 (patch)
tree34c05ca523b4c8def2440b5b8757cf5a21371478 /sql
parentd02a9bd0c54ba7b713f30a173ad549a8a5a176cf (diff)
parent640abc687c74dc0cf0ffb2cd5018bd82190a9b95 (diff)
downloadmariadb-git-9263b77e0c48a457cd097892b98fc00cba20dc15.tar.gz
Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_insert.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 1e00bb3f8c2..8db2c13b51d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -332,7 +332,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
{
char buff[160];
if (duplic == DUP_IGNORE)
- sprintf(buff,ER(ER_INSERT_INFO),info.records,info.records-info.copied,
+ sprintf(buff,ER(ER_INSERT_INFO),info.records,
+ (lock_type == TL_WRITE_DELAYED) ? 0 :
+ info.records-info.copied,
thd->cuted_fields);
else
sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,