diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 857f5b99a90..1da038c9c7f 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -35,6 +35,7 @@ typedef struct st_net { my_bool thread_specific_malloc; unsigned char compress; my_bool unused3; + unsigned long real_network_read_len; void *thd; unsigned int last_errno; unsigned char error; diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 862113c224a..32d38cd41ef 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -774,6 +774,9 @@ The following options may be given as the first argument: --range-alloc-block-size=# Allocation block size for storing ranges during optimization + --read-binlog-speed-limit=# + Maximum speed(KB/s) to read binlog from master (0 = no + limit) --read-buffer-size=# Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do @@ -1399,6 +1402,7 @@ query-cache-type OFF query-cache-wlock-invalidate FALSE query-prealloc-size 24576 range-alloc-block-size 4096 +read-binlog-speed-limit 0 read-buffer-size 131072 read-only FALSE read-rnd-buffer-size 262144 diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 2a6c24653e1..6cc43cdc1dc 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -3439,6 +3439,20 @@ NUMERIC_BLOCK_SIZE 1024 ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME READ_BINLOG_SPEED_LIMIT +SESSION_VALUE NULL +GLOBAL_VALUE 0 +GLOBAL_VALUE_ORIGIN COMPILE-TIME +DEFAULT_VALUE 0 +VARIABLE_SCOPE GLOBAL +VARIABLE_TYPE BIGINT UNSIGNED +VARIABLE_COMMENT Maximum speed(KB/s) to read binlog from master (0 = no limit) +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_BLOCK_SIZE 1 +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME READ_BUFFER_SIZE SESSION_VALUE 131072 GLOBAL_VALUE 131072