database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fix common test suite

Browse Source
This commit is contained in:
vinchen
2016-10-11 15:21:20 +08:00
committed by Kristian Nielsen
parent 43789901c7
commit ef77847ccf
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/mysql.h.pp
View File

@ -35,6 +35,7 @@ typedef struct st_net {
my_bool thread_specific_malloc; my_bool thread_specific_malloc;
unsigned char compress; unsigned char compress;
my_bool unused3; my_bool unused3;
unsigned long real_network_read_len;
void *thd; void *thd;
unsigned int last_errno; unsigned int last_errno;
unsigned char error; unsigned char error;

4
mysql-test/r/mysqld--help.result
View File

@ -774,6 +774,9 @@ The following options may be given as the first argument:
--range-alloc-block-size=# --range-alloc-block-size=#
Allocation block size for storing ranges during Allocation block size for storing ranges during
optimization optimization
--read-binlog-speed-limit=#
Maximum speed(KB/s) to read binlog from master (0 = no
limit)
--read-buffer-size=# --read-buffer-size=#
Each thread that does a sequential scan allocates a Each thread that does a sequential scan allocates a
buffer of this size for each table it scans. If you do 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-cache-wlock-invalidate FALSE
query-prealloc-size 24576 query-prealloc-size 24576
range-alloc-block-size 4096 range-alloc-block-size 4096
read-binlog-speed-limit 0
read-buffer-size 131072 read-buffer-size 131072
read-only FALSE read-only FALSE
read-rnd-buffer-size 262144 read-rnd-buffer-size 262144

14
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -3439,6 +3439,20 @@ NUMERIC_BLOCK_SIZE 1024
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED 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 VARIABLE_NAME READ_BUFFER_SIZE
SESSION_VALUE 131072 SESSION_VALUE 131072
GLOBAL_VALUE 131072 GLOBAL_VALUE 131072