diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
| commit | 7af5094208edac1dd3af9ba2883f3c91264fbf6a (patch) | |
| tree | 89c69aad253aa731dde00030a149eadbd82193ad /sql/log_event.h | |
| parent | 9be9ad7b05590c3dc1ec432256f41924efa5ada0 (diff) | |
| parent | 1040f98ccffccbed8d1e95fe8252e402b8ee4e3f (diff) | |
| download | mariadb-git-7af5094208edac1dd3af9ba2883f3c91264fbf6a.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index f58e1064d32..1841420ed86 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -1032,7 +1032,7 @@ 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(ptr); } |