Fixed bug from last commit

68657024 · monty@donna.mysql.fi · 91c4407e · 68657024 · 68657024
Commit 68657024 authored May 03, 2001 by monty@donna.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Docs/manual.texi Docs/manual.texi +3 -0

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -44001,6 +44001,9 @@ Allow @code{SELECT expression LIMIT ...}.
 Added @code{IDENTITY} as a synonym for @code{AUTO_INCREMENT} (like Sybase).
 @item
 Added @code{ORDER BY} syntax to @code{UPDATE} and @code{DELETE}.
+@item
+Optimized queries of type:
+@code{SELECT DISTINCT * from table_name ORDER by key_part1 LIMIT #}
 @end itemize

 @node News-3.23.x, News-3.22.x, News-4.0.x, News
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1438,7 +1438,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
    KEY_FIELD *key_fields,*end;

    if (!(key_fields=(KEY_FIELD*)
-	  thd->alloc((sizeof(key_fields[0])*thd->cond_count+1)*2)))
+	  thd->alloc(sizeof(key_fields[0])*(thd->cond_count+1)*2)))
      return TRUE; /* purecov: inspected */
    and_level=0; end=key_fields;
    if (cond)