bzr push into mysql-next-mr-bugfixing branch (oystein.grovlen:3241 to 3242) Bug#48213

[Oystein Grovlen]

 3242 Oystein Grovlen	2010-09-14
      Bug#48213 - Materialized subselect crashes if using GEOMETRY type
      (Addendum #2) 
      Removed part of comment for Item_in_subselect::setup_engine()
      since it is no longer true after fix for Bug#48213.
     @ sql/item_subselect.cc
        Removed comment that is invalid after Bug#48213 was fixed.

    modified:
      sql/item_subselect.cc
 3241 Evgeny Potemkin	2010-09-10 [merge]
      Auto-merged.

    modified:
      mysql-test/r/create.result
      mysql-test/r/ctype_collate.result
      mysql-test/r/explain.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_nested.result
      mysql-test/r/join_optimizer.result
      mysql-test/r/merge.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/myisam.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/r/null.result
      mysql-test/r/optimizer_switch_eng_cond_pushdown1.result
      mysql-test/r/optimizer_switch_eng_cond_pushdown2.result
      mysql-test/r/ps_1general.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subselect_innodb.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/t/privilege_table_io.test
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
      mysql-test/suite/sys_vars/r/optimizer_join_cache_level_basic.result
      mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
      mysql-test/t/subquery_sj_firstmatch.test
      mysql-test/t/subselect_innodb.test
      sql/authors.h
      sql/sql_priv.h
      sql/sql_show.cc
      storage/perfschema/ha_perfschema.cc
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2010-09-07 19:07:18 +0000
+++ b/sql/item_subselect.cc	2010-09-14 09:26:55 +0000
@@ -1836,12 +1836,6 @@ bool Item_in_subselect::fix_fields(THD *
     of this Item's execution. The method creates a new engine for
     materialized execution, and initializes the engine.
 
-    If this initialization fails
-    - either because it wasn't possible to create the needed temporary table
-      and its index,
-    - or because of a memory allocation error,
-    then we revert back to execution via the IN=>EXISTS tranformation.
-
     The initialization of the new engine is divided in two parts - a permanent
     one that lives across prepared statements, and one that is repeated for each
     execution.


Attachment: [text/bzr-bundle] bzr/[e-mail]