diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:14:14 +0100 |
| commit | b395490480dcf636a09a45f36733c32ec14b1772 (patch) | |
| tree | c9b1db7cfc763396ac45fed931a526ddf538698a /client | |
| parent | 401628a18eebedaf7bdf95b0a25c09398e4c19d9 (diff) | |
| parent | 101c30ccc48d38c3ea98ebd89a350120a45aa591 (diff) | |
| download | mariadb-git-b395490480dcf636a09a45f36733c32ec14b1772.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-show_binlog_events2.inc:
Auto merged
sql-common/client.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 4199a892e96..a2110bee339 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -270,7 +270,7 @@ public: File prepare_new_file_for_old_format(Load_log_event *le, char *filename); int load_old_format_file(NET* net, const char *server_fname, uint server_fname_len, File file); - int process_first_event(const char *bname, uint blen, const char *block, + int process_first_event(const char *bname, uint blen, const uchar *block, uint block_len, uint file_id, Create_file_log_event *ce); }; @@ -375,7 +375,7 @@ int Load_log_processor::load_old_format_file(NET* net, const char*server_fname, */ int Load_log_processor::process_first_event(const char *bname, uint blen, - const char *block, uint block_len, + const uchar *block, uint block_len, uint file_id, Create_file_log_event *ce) { |