← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 17:18:41 UTC
  • mfrom: (287.3.13 codestyle)
  • Revision ID: brian@tangent.org-20080810171841-pkvi2ky94wbd0nt5
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
4124
4124
  else
4125
4125
  {
4126
4126
    cost->zero();
4127
 
    *buffer_size= max(*buffer_size, 
 
4127
    *buffer_size= max((ulong)*buffer_size, 
4128
4128
                      (size_t)(1.2*rows_in_last_step) * elem_size + 
4129
4129
                      h->ref_length + table->key_info[keynr].key_length);
4130
4130
  }