database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge main 5.3 into 5.3-mwl89.

Browse Source
This commit is contained in:
unknown
2010-07-16 15:10:55 +03:00
parent 875bd20a73 2d78ffb8d5
commit 0d35bddf00
52 changed files with 731 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_class.cc
View File

@ -2994,14 +2994,28 @@ create_result_table(THD *thd_arg, List<Item> *column_types,
if (!stat)
return TRUE;
cleanup();
reset();
table->file->extra(HA_EXTRA_WRITE_CACHE);
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
return FALSE;
}
void select_materialize_with_stats::reset()
{
memset(col_stat, 0, table->s->fields * sizeof(Column_statistics));
max_nulls_in_row= 0;
count_rows= 0;
}
void select_materialize_with_stats::cleanup()
{
reset();
select_union::cleanup();
}
/**
Override select_union::send_data to analyze each row for NULLs and to
update null_statistics before sending data to the client.