← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_union.cc

merge READ COMMITTED bug fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_union.cc
400
400
  uint64_t add_rows=0;
401
401
  ha_rows examined_rows= 0;
402
402
 
403
 
  if (executed && !uncacheable && !describe)
404
 
    return(false);
 
403
  if (executed && uncacheable.none() && ! describe)
 
404
    return false;
405
405
  executed= 1;
406
406
 
407
 
  if (uncacheable || !item || !item->assigned() || describe)
 
407
  if (uncacheable.any() || ! item || ! item->assigned() || describe)
408
408
  {
409
409
    if (item)
410
410
      item->reset_value_registration();