database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-02 14:22:51 +03:00
Code Activity

Merge of the mwl106 tree into the latest 5.3 tree.

Browse Source 
Resolved conflicts. Adjusted some test results
This commit is contained in:
Igor Babaev
2010-09-23 08:10:53 -07:00
parent cfbd927024 709a0a1310
commit b969df8bbd
72 changed files with 4103 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -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;