Commit 9263b77e authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

Merge hundin.mysql.fi:/my/mysql-3.23

into hundin.mysql.fi:/my/bk/mysql-4.0
parents d02a9bd0 640abc68
No related merge requests found
...@@ -49782,6 +49782,7 @@ users use this code as the rest of the code and because of this we are ...@@ -49782,6 +49782,7 @@ users use this code as the rest of the code and because of this we are
not yet 100% confident in this code. not yet 100% confident in this code.
@menu @menu
* News-3.23.52:: Changes in release 3.23.52
* News-3.23.51:: Changes in release 3.23.51 * News-3.23.51:: Changes in release 3.23.51
* News-3.23.50:: Changes in release 3.23.50 (21 Apr 2002) * News-3.23.50:: Changes in release 3.23.50 (21 Apr 2002)
* News-3.23.49:: Changes in release 3.23.49 * News-3.23.49:: Changes in release 3.23.49
...@@ -49837,7 +49838,18 @@ not yet 100% confident in this code. ...@@ -49837,7 +49838,18 @@ not yet 100% confident in this code.
* News-3.23.0:: Changes in release 3.23.0 (Sep 1999: Alpha) * News-3.23.0:: Changes in release 3.23.0 (Sep 1999: Alpha)
@end menu @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 @appendixsubsec Changes in release 3.23.51
@itemize @bullet @itemize @bullet
...@@ -332,7 +332,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, ...@@ -332,7 +332,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields,
{ {
char buff[160]; char buff[160];
if (duplic == DUP_IGNORE) 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); thd->cuted_fields);
else else
sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted, sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment