diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /sql/sql_class.cc | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cf52b4008f3..925a39afa33 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -813,6 +813,7 @@ THD::THD() m_binlog_invoker= FALSE; memset(&invoker_user, 0, sizeof(invoker_user)); memset(&invoker_host, 0, sizeof(invoker_host)); + prepare_derived_at_open= FALSE; } @@ -3047,7 +3048,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; |