summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-10-19 20:36:59 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-10-19 20:36:59 -0200
commit1040f98ccffccbed8d1e95fe8252e402b8ee4e3f (patch)
tree5560db90147dedcfccab23a9d59fb20480b93f51 /sql/log_event.h
parent7406b38efa0a2eec5a245839c5ce13b85d51d125 (diff)
downloadmariadb-git-1040f98ccffccbed8d1e95fe8252e402b8ee4e3f.tar.gz
Bug#45288: pb2 returns a lot of compilation warnings
Tag or remove unused arguments and variables. regex/main.c: Use the real prototype. sql/ha_ndbcluster.cc: Make conditions less ambiguous.
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 662fec23639..75f2015a684 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -979,9 +979,9 @@ public:
return (void*) my_malloc((uint)size, MYF(MY_WME|MY_FAE));
}
- static void operator delete(void *ptr, size_t size)
+ static void operator delete(void *ptr, size_t)
{
- my_free((uchar*) ptr, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
+ my_free(ptr, MYF(MY_WME|MY_ALLOW_ZERO_PTR));
}
/* Placement version of the above operators */