diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-05 16:42:07 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-05 16:42:07 +0300 |
| commit | 47c4352b5842383bbdbbfea3c0b5e91716c87058 (patch) | |
| tree | 31f8bd37856d885a833f1796099472d9a0c9c8cd | |
| parent | 32113efe2a7d32bfa5820cda37164436a53719cc (diff) | |
| download | mariadb-git-47c4352b5842383bbdbbfea3c0b5e91716c87058.tar.gz | |
Fixed mysql_info() result when using INSERT DELAYED
Docs/manual.texi:
changelog
| -rw-r--r-- | Docs/manual.texi | 14 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index d8b63c71726..353e0727a22 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46868,6 +46868,7 @@ users use this code as the rest of the code and because of this we are not yet 100% confident in this code. @menu +* News-3.23.52:: Changes in release 3.23.52 * News-3.23.51:: Changes in release 3.23.51 * News-3.23.50:: Changes in release 3.23.50 * News-3.23.49:: Changes in release 3.23.49 @@ -46923,7 +46924,18 @@ not yet 100% confident in this code. * News-3.23.0:: Changes in release 3.23.0 @end menu -@node News-3.23.51, News-3.23.50, News-3.23.x, News-3.23.x +@node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x +@appendixsubsec Changes in release 3.23.52 +@itemize @bullet +@item +Fixed possible problem in replication when doing @code{DROP DATABASE} on a +database with InnoDB tables. +@item +Fixed that @code{mysql_info()} returns 0 for 'Duplicates' when using +@code{INSERT DELAYED IGNORE}. +@end itemize + +@node News-3.23.51, News-3.23.50, News-3.23.52, News-3.23.x @appendixsubsec Changes in release 3.23.51 @itemize @bullet @item diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d8861390d87..18100996f52 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -299,7 +299,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, |