diff options
| author | unknown <monty@tik.mysql.fi> | 2001-08-08 21:09:24 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-08-08 21:09:24 +0300 |
| commit | b55459799789a7ffec4986aa58d70e78a73e687e (patch) | |
| tree | 6211167d64274a546bd10e7807a53291aecc596f | |
| parent | 5d7647dcb3891815069e7bb06eb0abe889bdcf6d (diff) | |
| parent | 5496e67da107471cfa66fe922573e0bc47bae919 (diff) | |
| download | mariadb-git-b55459799789a7ffec4986aa58d70e78a73e687e.tar.gz | |
Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql
Docs/manual.texi:
Auto merged
| -rw-r--r-- | Docs/manual.texi | 5 | ||||
| -rw-r--r-- | sql/sql_select.cc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 86a4b92f304..e7cce565698 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -45672,7 +45672,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.41:: +* News-3.23.41:: Changes in release 3.23.41 * News-3.23.40:: Changes in release 3.23.40 * News-3.23.39:: Changes in release 3.23.39 * News-3.23.38:: Changes in release 3.23.38 @@ -45723,6 +45723,9 @@ not yet 100% confident in this code. @item Fixed optimizing bug in @code{ORDER BY} where some @code{ORDER BY} parts where wrongly removed. +@item +Fixed bug in @code{SELECT DISTINCT ... HAVING} that casued error message +@code{Can't find record in '#...} @end itemize @node News-3.23.40, News-3.23.39, News-3.23.41, News-3.23.x diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d23a7edd37e..00f92e56b71 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5425,6 +5425,7 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field, { if ((error=file->delete_row(record))) goto err; + error=file->rnd_next(record); continue; } if (copy_blobs(first_field)) |