diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-12-11 12:06:34 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-12-11 12:06:34 -0700 |
commit | 7429b2e1e830911fe73b37aa3c201e6774114c34 (patch) | |
tree | 06aa933eac99f585851460d08dbc8105cd1e456b /sql/log_event.h | |
parent | 5d6b2d0d3515d1ffc293ddaf83b875742e4cca09 (diff) | |
download | mariadb-git-7429b2e1e830911fe73b37aa3c201e6774114c34.tar.gz |
I hope I've fixed all the bugs by now, let's test it
sql/log_event.h:
changed new/delete for Log_event to use my_malloc/my_free
sql/mysql_priv.h:
wait for slave to get going
sql/mysqld.cc:
wait for slave to get going in SLAVE START
sql/slave.cc:
fixed more memory leaks
sql/sql_repl.cc:
file name was not being \0 terminated in send_file
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 3d307000b13..babf76aa428 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -65,6 +65,16 @@ public: int valid_exec_time; // if false, the exec time setting is bogus uint32 server_id; + static void *operator new(size_t size) + { + return (void*) my_malloc((uint)size, MYF(MY_WME|MY_FAE)); + } + + static void operator delete(void *ptr, size_t size) + { + my_free((byte*)ptr, MYF(MY_WME|MY_ALLOW_ZERO_PTR)); + } + int write(IO_CACHE* file); int write_header(IO_CACHE* file); virtual int write_data(IO_CACHE* file __attribute__((unused))) { return 0; } |