← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/item_subselect.cc

  • Committer: Brian Aker
  • Date: 2008-07-11 16:46:57 UTC
  • Revision ID: brian@tangent.org-20080711164657-45weklayjvmpbr2u
Cleanup of warning/errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/item_subselect.cc
1410
1410
    Item *item_having_part2= 0;
1411
1411
    for (uint i= 0; i < cols_num; i++)
1412
1412
    {
1413
 
      assert(left_expr->fixed &&
1414
 
                  select_lex->ref_pointer_array[i]->fixed ||
 
1413
      assert((left_expr->fixed && select_lex->ref_pointer_array[i]->fixed) ||
1415
1414
                  (select_lex->ref_pointer_array[i]->type() == REF_ITEM &&
1416
1415
                   ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() ==
1417
1416
                    Item_ref::OUTER_REF));
1488
1487
    for (uint i= 0; i < cols_num; i++)
1489
1488
    {
1490
1489
      Item *item, *item_isnull;
1491
 
      assert(left_expr->fixed &&
1492
 
                  select_lex->ref_pointer_array[i]->fixed ||
 
1490
      assert((left_expr->fixed && select_lex->ref_pointer_array[i]->fixed) ||
1493
1491
                  (select_lex->ref_pointer_array[i]->type() == REF_ITEM &&
1494
1492
                   ((Item_ref*)(select_lex->ref_pointer_array[i]))->ref_type() ==
1495
1493
                    Item_ref::OUTER_REF));