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

MDEV-36536 post-review changes

Browse Source 
that were apparently partially lost in a rebase
This commit is contained in:
Sergei Golubchik
2025-04-29 11:34:35 +02:00
parent 739578915f
commit 83e0438f62
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/main/mysqld--help.result
View File

@ -16,9 +16,9 @@ The following specify which files/extra groups are read (specified before remain
Specify the alter table algorithm. One of: DEFAULT, COPY, Specify the alter table algorithm. One of: DEFAULT, COPY,
INPLACE, NOCOPY, INSTANT INPLACE, NOCOPY, INSTANT
--analyze-max-length=# --analyze-max-length=#
Fields that require more storage than analyze_max_length Fields which length in bytes more than this are skipped
and are not listed in ANALYZE ... FOR COLUMNS () will by ANALYZE TABLE PERSISTENT unless explicitly listed in
automatically be skipped by ANALYZE TABLE PERSISTENT the FOR COLUMNS () clause
--analyze-sample-percentage=# --analyze-sample-percentage=#
Percentage of rows from the table ANALYZE TABLE will Percentage of rows from the table ANALYZE TABLE will
sample to collect table statistics. Set to 0 to let sample to collect table statistics. Set to 0 to let

4
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@ -24,8 +24,8 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME ANALYZE_MAX_LENGTH VARIABLE_NAME ANALYZE_MAX_LENGTH
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Fields which length in bytes are more than analyze_max_length are skipped by ANALYZE TABLE PERSISTENT unless explicitly listed in the FOR COLUMNS () clause VARIABLE_COMMENT Fields which length in bytes more than this are skipped by ANALYZE TABLE PERSISTENT unless explicitly listed in the FOR COLUMNS () clause
NUMERIC_MIN_VALUE 32 NUMERIC_MIN_VALUE 32
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1

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

@ -24,8 +24,8 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME ANALYZE_MAX_LENGTH VARIABLE_NAME ANALYZE_MAX_LENGTH
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Fields that require more storage than analyze_max_length and are not listed in ANALYZE ... FOR COLUMNS () will automatically be skipped by ANALYZE TABLE PERSISTENT VARIABLE_COMMENT Fields which length in bytes more than this are skipped by ANALYZE TABLE PERSISTENT unless explicitly listed in the FOR COLUMNS () clause
NUMERIC_MIN_VALUE 32 NUMERIC_MIN_VALUE 32
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1

2
sql/sql_class.h
View File

@ -731,7 +731,7 @@ typedef struct system_variables
ha_rows select_limit; ha_rows select_limit;
ha_rows max_join_size; ha_rows max_join_size;
ha_rows expensive_subquery_limit; ha_rows expensive_subquery_limit;
ulong analyze_max_length; uint analyze_max_length;
ulong auto_increment_increment, auto_increment_offset; ulong auto_increment_increment, auto_increment_offset;
#ifdef WITH_WSREP #ifdef WITH_WSREP
/* /*

7
sql/sys_vars.cc
View File

@ -450,11 +450,10 @@ static Sys_var_double Sys_analyze_sample_percentage(
from analyze. from analyze.
*/ */
static Sys_var_ulong Sys_analyze_max_length( static Sys_var_uint Sys_analyze_max_length(
"analyze_max_length", "analyze_max_length",
"Fields that require more storage than analyze_max_length and are not " "Fields which length in bytes more than this are skipped by ANALYZE "
"listed in ANALYZE ... FOR COLUMNS () will automatically be skipped by " "TABLE PERSISTENT unless explicitly listed in the FOR COLUMNS () clause",
"ANALYZE TABLE PERSISTENT",
SESSION_VAR(analyze_max_length), SESSION_VAR(analyze_max_length),
CMD_LINE(REQUIRED_ARG), VALID_RANGE(32, UINT_MAX32), CMD_LINE(REQUIRED_ARG), VALID_RANGE(32, UINT_MAX32),
DEFAULT(UINT_MAX32), BLOCK_SIZE(1)); DEFAULT(UINT_MAX32), BLOCK_SIZE(1));