diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-10-29 14:21:23 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-10-29 14:21:23 +0200 |
| commit | 2d9a473bb67eb5d46ef3facf9384e2b9a621b79e (patch) | |
| tree | 2e85eb609791b2bf6c638a6aaa5a5a5edbed1a4d | |
| parent | 14c5bdbcbcddda9aea14725259246f27f635e48f (diff) | |
| parent | 7a8b483d5feddb02071cfef21ef5b9bce946808b (diff) | |
| download | mariadb-git-2d9a473bb67eb5d46ef3facf9384e2b9a621b79e.tar.gz | |
Merge bk://work.mysql.com:7001
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| -rw-r--r-- | Docs/manual.texi | 4 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index c39da1e37d1..b78b83828b1 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -50815,6 +50815,10 @@ each individual 4.0.x release. @appendixsubsec Changes in release 4.0.5 @itemize @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 @item Fixed a newly introduced bug that caused @code{ORDER BY ... LIMIT #} diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fc5fe33288f..2b6a3a70344 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3708,7 +3708,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, *blob_field= 0; // End marker /* 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)) == OPTION_BIG_TABLES) { |