Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql

Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2001-08-08 04:04:12 +03:00
commit 5496e67da1
2 changed files with 5 additions and 1 deletions

View file

@ -45643,7 +45643,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.41:: * News-3.23.41:: Changes in release 3.23.41
* News-3.23.40:: Changes in release 3.23.40 * News-3.23.40:: Changes in release 3.23.40
* News-3.23.39:: Changes in release 3.23.39 * News-3.23.39:: Changes in release 3.23.39
* News-3.23.38:: Changes in release 3.23.38 * News-3.23.38:: Changes in release 3.23.38
@ -45694,6 +45694,9 @@ not yet 100% confident in this code.
@item @item
Fixed optimizing bug in @code{ORDER BY} where some @code{ORDER BY} parts Fixed optimizing bug in @code{ORDER BY} where some @code{ORDER BY} parts
where wrongly removed. where wrongly removed.
@item
Fixed bug in @code{SELECT DISTINCT ... HAVING} that casued error message
@code{Can't find record in '#...}
@end itemize @end itemize
@node News-3.23.40, News-3.23.39, News-3.23.41, News-3.23.x @node News-3.23.40, News-3.23.39, News-3.23.41, News-3.23.x

View file

@ -5425,6 +5425,7 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
{ {
if ((error=file->delete_row(record))) if ((error=file->delete_row(record)))
goto err; goto err;
error=file->rnd_next(record);
continue; continue;
} }
if (copy_blobs(first_field)) if (copy_blobs(first_field))