diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
| commit | af651c80f7d7b49a141958a68e81f2de90e62f25 (patch) | |
| tree | fe6beb28814b0e5a149dde1597463c8fe9faa177 /client | |
| parent | f02fdb6b55a2b29595cb7e4eed48a51755e967fb (diff) | |
| parent | 5c66abf0b0de6d632f85a57c841f80d28a7e0337 (diff) | |
| download | mariadb-git-af651c80f7d7b49a141958a68e81f2de90e62f25.tar.gz | |
Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
storage/innobase/include/trx0trx.h
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 7c93e8d3ebd..7a54a693cb4 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -49,6 +49,8 @@ #include "mysqld.h" +#include <algorithm> + Rpl_filter *binlog_filter= 0; #define BIN_LOG_HEADER_SIZE 4 @@ -67,6 +69,7 @@ ulong server_id = 0; ulong bytes_sent = 0L, bytes_received = 0L; ulong mysqld_net_retry_count = 10L; ulong open_files_limit; +ulong opt_binlog_rows_event_max_size; uint test_flags = 0; static uint opt_protocol= 0; static FILE *result_file; @@ -1436,6 +1439,12 @@ that may lead to an endless loop.", "Used to reserve file descriptors for use by this program.", &open_files_limit, &open_files_limit, 0, GET_ULONG, REQUIRED_ARG, MY_NFILE, 8, OS_FILE_LIMIT, 0, 1, 0}, + {"binlog-row-event-max-size", 0, + "The maximum size of a row-based binary log event in bytes. Rows will be " + "grouped into events smaller than this size if possible. " + "This value must be a multiple of 256.", + &opt_binlog_rows_event_max_size, &opt_binlog_rows_event_max_size, 0, + GET_ULONG, REQUIRED_ARG, UINT_MAX, 256, ULONG_MAX, 0, 256, 0}, {"verify-binlog-checksum", 'c', "Verify checksum binlog events.", (uchar**) &opt_verify_binlog_checksum, (uchar**) &opt_verify_binlog_checksum, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, |