1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk://work.mysql.com:7001

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-10-29 14:21:23 +02:00
commit 2452182844
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Docs/manual.texi
View File

@ -50815,6 +50815,10 @@ each individual 4.0.x release.
@appendixsubsec Changes in release 4.0.5 @appendixsubsec Changes in release 4.0.5
@itemize @itemize
@item @item
Removed a condition that temp table with index on column that can be NULL has
to be MyISAM. This was OK for 3.23, but not needed in 4.*. This resulted in
slowdown in many queries since 4.0.2
@item
Small code improvement in multi-table updates Small code improvement in multi-table updates
@item @item
Fixed a newly introduced bug that caused @code{ORDER BY ... LIMIT #} Fixed a newly introduced bug that caused @code{ORDER BY ... LIMIT #}

2
sql/sql_select.cc
View File

@ -3708,7 +3708,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
*blob_field= 0; // End marker *blob_field= 0; // End marker
/* If result table is small; use a heap */ /* If result table is small; use a heap */
if (blob_count || using_unique_constraint || group_null_items || if (blob_count || using_unique_constraint ||
(select_options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) == (select_options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
OPTION_BIG_TABLES) OPTION_BIG_TABLES)
{ {