← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_lex.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_lex.cc
2066
2066
                    ((Item_in_subselect*)item)->exec_method ==
2067
2067
                    Item_in_subselect::MATERIALIZATION) ?
2068
2068
                   TRUE :
2069
 
                   (select_limit->val_int() == LL(1)) &&
 
2069
                   (select_limit->val_int() == 1LL) &&
2070
2070
                   offset_limit == 0));
2071
2071
      return;
2072
2072
    }
2431
2431
    select_limit_val= HA_POS_ERROR;
2432
2432
#endif
2433
2433
  offset_limit_cnt= (ha_rows)(sl->offset_limit ? sl->offset_limit->val_uint() :
2434
 
                                                 ULL(0));
 
2434
                                                 0ULL);
2435
2435
  select_limit_cnt= select_limit_val + offset_limit_cnt;
2436
2436
  if (select_limit_cnt < select_limit_val)
2437
2437
    select_limit_cnt= HA_POS_ERROR;             // no limit