← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Nathan Williams
  • Date: 2009-06-30 21:28:16 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090630212816-tgxr6w1y9oe9twfy
Fixed a few more system dependent type errors (size_t vs unsigned vs long unsigned).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/handler.cc
2938
2938
  else
2939
2939
  {
2940
2940
    cost->zero();
2941
 
    *buffer_size= max((ulong)*buffer_size,
2942
 
                      (size_t)(1.2*rows_in_last_step) * elem_size +
 
2941
    *buffer_size= max(*buffer_size,
 
2942
                      (uint32_t)(1.2*rows_in_last_step) * elem_size +
2943
2943
                      h->ref_length + table->key_info[keynr].key_length);
2944
2944
  }
2945
2945