← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
54
54
  {
55
55
    memset(&alloc, 0, sizeof(memory::Root));
56
56
  }
57
 
  last_rowid= (unsigned char*) alloc_root(parent_alloc ? parent_alloc : &alloc,
58
 
                                          head->cursor->ref_length);
 
57
 
 
58
  if (parent_alloc)
 
59
  {
 
60
    last_rowid= (unsigned char*) parent_alloc->alloc_root(head->cursor->ref_length);
 
61
  }
 
62
  else
 
63
  {
 
64
    last_rowid= (unsigned char*) alloc.alloc_root(head->cursor->ref_length);
 
65
  }
59
66
}
60
67
 
61
68
 
66
73
           DeletePtr());
67
74
  quick_selects.clear();
68
75
  delete cpk_quick;
69
 
  free_root(&alloc,MYF(0));
 
76
  alloc.free_root(MYF(0));
70
77
  if (need_to_fetch_row && head->cursor->inited != Cursor::NONE)
71
78
  {
72
 
    head->cursor->ha_rnd_end();
 
79
    head->cursor->endTableScan();
73
80
  }
74
81
  return;
75
82
}
112
119
    ++it;
113
120
  }
114
121
 
115
 
  if (need_to_fetch_row && head->cursor->ha_rnd_init(1))
 
122
  if (need_to_fetch_row && head->cursor->startTableScan(1))
116
123
  {
117
124
    return 0;
118
125
  }
247
254
       it != quick_selects.end();
248
255
       ++it)
249
256
  {
250
 
    KEY *key_info= head->key_info + (*it)->index;
 
257
    KeyInfo *key_info= head->key_info + (*it)->index;
251
258
    if (! first)
252
259
      str->append(',');
253
260
    else
256
263
  }
257
264
  if (cpk_quick)
258
265
  {
259
 
    KEY *key_info= head->key_info + cpk_quick->index;
 
266
    KeyInfo *key_info= head->key_info + cpk_quick->index;
260
267
    str->append(',');
261
268
    str->append(key_info->name);
262
269
  }
274
281
       it != quick_selects.end();
275
282
       ++it)
276
283
  {
277
 
    KEY *key_info= head->key_info + (*it)->index;
 
284
    KeyInfo *key_info= head->key_info + (*it)->index;
278
285
    if (first)
279
286
    {
280
287
      first= false;
291
298
 
292
299
  if (cpk_quick)
293
300
  {
294
 
    KEY *key_info= head->key_info + cpk_quick->index;
 
301
    KeyInfo *key_info= head->key_info + cpk_quick->index;
295
302
    key_names->append(',');
296
303
    key_names->append(key_info->name);
297
304
    length= internal::int64_t2str(cpk_quick->max_used_key_length, buf, 10) - buf;