diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-05 23:10:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-05 23:10:29 +0300 |
| commit | 62aa4e9ff2501edac2e03c65c1f4b66084307706 (patch) | |
| tree | 34c05ca523b4c8def2440b5b8757cf5a21371478 /sql | |
| parent | ab32dcd3bef4ad7931f0b4689c3293c9c63fed48 (diff) | |
| parent | 47c4352b5842383bbdbbfea3c0b5e91716c87058 (diff) | |
| download | mariadb-git-62aa4e9ff2501edac2e03c65c1f4b66084307706.tar.gz | |
Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
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, |