diff options
| author | unknown <monty@mysql.com> | 2004-02-13 16:05:09 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-13 16:05:09 +0200 |
| commit | 0a95bda23a349639bd51c4b2c71da56ebd13d31f (patch) | |
| tree | 0fed6c37f6c17ba97ac09f0dbecdf6846b11a97b /sql/log_event.h | |
| parent | 82e82a88e7704330ea1ac5c7d885c1cee56c6618 (diff) | |
| download | mariadb-git-0a95bda23a349639bd51c4b2c71da56ebd13d31f.tar.gz | |
Always use libtool with "--preserve-dup-deps"
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
client/mysqlbinlog.cc:
Ensure that we don't call init_dynamic_array() before my_init() has been done
configure.in:
Always use libtool with "--preserve-dup-deps" to prevent link problems with g++
mysql-test/r/mysqlbinlog.result:
new results
mysql-test/r/range.result:
new results
mysql-test/t/range.test:
add missing DROP TABLE
sql/log_event.cc:
Always use all LOAD DATA options. This is needed to handle commands of type "FIELDS TERMINATED BY ''"
Allocate memory for Create_file_log_event options as these may be overwritten in mysqlbinlog
sql/log_event.h:
Free buffer
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 b610263a462..2eaaab260fc 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -644,6 +644,7 @@ protected: bool fake_base; public: char* block; + const char *event_buf; uint block_len; uint file_id; bool inited_from_old; @@ -663,7 +664,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() { |