← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-09-22 23:53:43 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080922235343-ihqvp6g9k1mtzxmc
Renamed max/min.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
931
931
    of 13 bytes, whereas LOG_EVENT_MINIMAL_HEADER_LEN is 19 bytes (it's
932
932
    "minimal" over the set {MySQL >=4.0}).
933
933
  */
934
 
  uint header_size= min(description_event->common_header_len,
 
934
  uint header_size= cmin(description_event->common_header_len,
935
935
                        LOG_EVENT_MINIMAL_HEADER_LEN);
936
936
 
937
937
  LOCK_MUTEX;
1803
1803
      be even bigger, but this will suffice to catch most corruption
1804
1804
      errors that can lead to a crash.
1805
1805
    */
1806
 
    if (status_vars_len > min(data_len, (uint32_t)MAX_SIZE_LOG_EVENT_STATUS))
 
1806
    if (status_vars_len > cmin(data_len, (uint32_t)MAX_SIZE_LOG_EVENT_STATUS))
1807
1807
    {
1808
1808
      query= 0;
1809
1809
      return;