Merge of the mwl106 tree into the latest 5.3 tree.

Resolved conflicts. Adjusted some test results 

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c48a0b0e7fb..99da8b95b3e 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -803,6 +803,7 @@ THD::THD()
   thr_lock_owner_init(&main_lock_id, &lock_info);
 
   m_internal_handler= NULL;
+  prepare_derived_at_open= FALSE;
 }
 
 
@@ -2978,7 +2979,8 @@ bool
 select_materialize_with_stats::
 create_result_table(THD *thd_arg, List<Item> *column_types,
                     bool is_union_distinct, ulonglong options,
-                    const char *table_alias, bool bit_fields_as_long)
+                    const char *table_alias, bool bit_fields_as_long,
+                    bool create_table)
 {
   DBUG_ASSERT(table == 0);
   tmp_table_param.field_count= column_types->elements;