← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/log_event.h

  • Committer: Monty Taylor
  • Date: 2008-07-05 10:49:39 UTC
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: monty@inaugust.com-20080705104939-72e6upltbm3aq0lw
Changes so that client/ builds cleanly with no warnings.
Commented out -Wunreachable-code for now, because there is too much of it
with all the #ifdef'd members. We'll add it back in for a second pass over
the code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/log_event.h
37
37
#ifndef MYSQL_CLIENT
38
38
#include "rpl_record.h"
39
39
#include "rpl_reporting.h"
 
40
#else
 
41
#include "my_decimal.h"
40
42
#endif
41
43
 
42
44
/**
931
933
    return (void*) my_malloc((uint)size, MYF(MY_WME|MY_FAE));
932
934
  }
933
935
 
934
 
  static void operator delete(void *ptr, size_t size)
 
936
  static void operator delete(void *ptr,
 
937
                              size_t size __attribute__((__unused__)))
935
938
  {
936
939
    my_free((uchar*) ptr, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
937
940
  }