~drizzle-trunk/drizzle/development

Viewing changes to drizzled/sql_select.cc

Committer: Brian Aker
Date: 2010-04-20 18:23:07 UTC
mto: This revision was merged to the branch mainline in revision 1502.
Revision ID: brian@gaz-20100420182307-jwyhun4vm2dtugyb

There is room for improvement around this. We should be using rows as well
in the future as a metric for disk/memory store.

Show diffs side-by-side

added added

removed removed

drizzled/sql_select.cc

119

120

if (select_lex->master_unit()->is_union() ||

121

select_lex->master_unit()->fake_select_lex)

122

{

122

123

res= drizzle_union(session, lex, result, &lex->unit,

123

124

setup_tables_done_option);

125

}

124

126

else

125

127

{

126

128

Select_Lex_Unit *unit= &lex->unit;

3231

3233

}

3232

3234

else if (join->sort_and_group && !tmp_tbl->precomputed_group_by)

3233

3235

{

3234

end_select=end_write_group;

3236

end_select= end_write_group;

3235

3237

}

3236

3238

else

3237

3239

{

3238

end_select=end_write;

3240

end_select= end_write;

3239

3241

if (tmp_tbl->precomputed_group_by)

3240

3242

{

3241

3243

4217

4219

if (!join->having || join->having->val_int())

4218

4220

{

4219

4221

int error= table->cursor->ha_write_row(table->record[0]);

4220

if (error && create_myisam_from_heap(join->session, table,

4221

join->tmp_table_param.start_recinfo,

4222

&join->tmp_table_param.recinfo,

4223

error, 0))

4224

return NESTED_LOOP_ERROR;

4222

4223

if (error)

4224

{

4225

my_error(ER_USE_SQL_BIG_RESULT, MYF(0));

4226

return NESTED_LOOP_ERROR;

4227

}

4225

4228

}

4226

4229

if (join->rollup.state != ROLLUP::STATE_NONE)

4227

4230

{

Older »