← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Brian Aker
  • Date: 2009-07-11 19:23:04 UTC
  • mfrom: (1089.1.14 merge)
  • Revision ID: brian@gaz-20090711192304-ootijyl5yf9jq9kd
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2834
2834
      reset_cache_read(&join_tab->cache);
2835
2835
      for (i=(join_tab->cache.records- (skip_last ? 1 : 0)) ; i-- > 0 ;)
2836
2836
      {
2837
 
              read_cached_record(join_tab);
 
2837
              join_tab->readCachedRecord();
2838
2838
              if (!select || !select->skip_record())
2839
2839
        {
2840
2840
          int res= 0;
2856
2856
  } while (!(error=info->read_record(info)));
2857
2857
 
2858
2858
  if (skip_last)
2859
 
    read_cached_record(join_tab);               // Restore current record
 
2859
    join_tab->readCachedRecord();               // Restore current record
2860
2860
  reset_cache_write(&join_tab->cache);
2861
2861
  if (error > 0)                                // Fatal error
2862
2862
    return NESTED_LOOP_ERROR;                   /* purecov: inspected */
5403
5403
 
5404
5404
  for (; join_tab != end ; join_tab++)
5405
5405
  {
5406
 
    TABLE_REF *ref= &join_tab->ref;
5407
 
    table_map depend_map=0;
 
5406
    table_reference_st *ref= &join_tab->ref;
 
5407
    table_map depend_map= 0;
5408
5408
    Item **item=ref->items;
5409
5409
    uint32_t i;
5410
5410
    for (i=0 ; i < ref->key_parts ; i++,item++)