diff options
| author | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
| commit | ebac2d25bcdcc74bf153a6a3568bfde5f1b17a8b (patch) | |
| tree | f9bef14abcf4ef1e6145cb3c16e63c9a56e221e9 /sql/log_event.h | |
| parent | a8983f072babd2e90385c4383f9d4f462e84f786 (diff) | |
| parent | 8637a78ad1b8d7c99ff73adb88ffc58d9f3d291e (diff) | |
| download | mariadb-git-ebac2d25bcdcc74bf153a6a3568bfde5f1b17a8b.tar.gz | |
Merge with 4.0 to get fix for mysqlbinlog
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
sql/log_event.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_load.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/mysqlbinlog.cc:
Merge with 4.0
configure.in:
Merge with 4.0
mysql-test/r/range.result:
Use local file
mysql-test/t/range.test:
Use local file
sql/share/english/errmsg.txt:
Use local file
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 1a5f0543766..28d1f44df92 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -885,6 +885,7 @@ protected: bool fake_base; public: char* block; + const char *event_buf; uint block_len; uint file_id; bool inited_from_old; @@ -906,7 +907,10 @@ public: #endif Create_file_log_event(const char* buf, int event_len, bool old_format); - ~Create_file_log_event() {} + ~Create_file_log_event() + { + my_free((char*) event_buf, MYF(MY_ALLOW_ZERO_PTR)); + } Log_event_type get_type_code() { |