Skip to content

M
MariaDB
Commit 9fc23586 authored by Igor Babaev's avatar Igor Babaev
Browse files
Options

Merge branch '10.2' into bb-10.2-mdev9864

parents de02bfd3 aaedb63e
Show whitespace changes
Inline Side-by-side
Showing with 611 additions and 3600 deletions
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View file @ 9fc23586
--- suite/sys_vars/r/sysvars_server_embedded.result --- suite/sys_vars/r/sysvars_server_embedded.result
+++ suite/sys_vars/r/sysvars_server_embedded,32bit.reject +++ suite/sys_vars/r/sysvars_server_embedded.reject
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE 1 DEFAULT_VALUE 1
...@@ -454,11 +454,20 @@ ...@@ -454,11 +454,20 @@
DEFAULT_VALUE 4294967295 DEFAULT_VALUE 4294967295
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Maximum number of iterations when executing recursive queries
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
@@ -2017,7 +2017,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4294967295
VARIABLE_SCOPE SESSION
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED +VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key VARIABLE_COMMENT Limit assumed max number of seeks when looking up rows based on a key
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2017,7 +2017,7 @@ @@ -2031,7 +2031,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -467,7 +476,7 @@ ...@@ -467,7 +476,7 @@
VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored) VARIABLE_COMMENT The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored)
NUMERIC_MIN_VALUE 4 NUMERIC_MIN_VALUE 4
NUMERIC_MAX_VALUE 8388608 NUMERIC_MAX_VALUE 8388608
@@ -2031,7 +2031,7 @@ @@ -2045,7 +2045,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -476,7 +485,7 @@ ...@@ -476,7 +485,7 @@
VARIABLE_COMMENT Maximum stored procedure recursion depth VARIABLE_COMMENT Maximum stored procedure recursion depth
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255 NUMERIC_MAX_VALUE 255
@@ -2059,7 +2059,7 @@ @@ -2073,7 +2073,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 32 DEFAULT_VALUE 32
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -485,7 +494,7 @@ ...@@ -485,7 +494,7 @@
VARIABLE_COMMENT Unused, will be removed. VARIABLE_COMMENT Unused, will be removed.
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2087,7 +2087,7 @@ @@ -2101,7 +2101,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4294967295 DEFAULT_VALUE 4294967295
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -494,7 +503,7 @@ ...@@ -494,7 +503,7 @@
VARIABLE_COMMENT After this many write locks, allow some read locks to run in between VARIABLE_COMMENT After this many write locks, allow some read locks to run in between
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2101,7 +2101,7 @@ @@ -2115,7 +2115,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -503,7 +512,7 @@ ...@@ -503,7 +512,7 @@
VARIABLE_COMMENT Unused VARIABLE_COMMENT Unused
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2115,7 +2115,7 @@ @@ -2129,7 +2129,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 8 DEFAULT_VALUE 8
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -512,7 +521,7 @@ ...@@ -512,7 +521,7 @@
VARIABLE_COMMENT Unused VARIABLE_COMMENT Unused
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 1024 NUMERIC_MAX_VALUE 1024
@@ -2129,7 +2129,7 @@ @@ -2143,7 +2143,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 0 DEFAULT_VALUE 0
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -521,7 +530,7 @@ ...@@ -521,7 +530,7 @@
VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that VARIABLE_COMMENT Don't write queries to slow log that examine fewer rows than that
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2143,7 +2143,7 @@ @@ -2157,7 +2157,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 262144 DEFAULT_VALUE 262144
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -530,7 +539,7 @@ ...@@ -530,7 +539,7 @@
VARIABLE_COMMENT Size of buffer to use when using MRR with range access VARIABLE_COMMENT Size of buffer to use when using MRR with range access
NUMERIC_MIN_VALUE 8192 NUMERIC_MIN_VALUE 8192
NUMERIC_MAX_VALUE 2147483647 NUMERIC_MAX_VALUE 2147483647
@@ -2157,10 +2157,10 @@ @@ -2171,10 +2171,10 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 256 DEFAULT_VALUE 256
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -543,7 +552,7 @@ ...@@ -543,7 +552,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -2171,7 +2171,7 @@ @@ -2185,7 +2185,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -552,7 +561,7 @@ ...@@ -552,7 +561,7 @@
VARIABLE_COMMENT Block size to be used for MyISAM index pages VARIABLE_COMMENT Block size to be used for MyISAM index pages
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 16384 NUMERIC_MAX_VALUE 16384
@@ -2185,7 +2185,7 @@ @@ -2199,7 +2199,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 6 DEFAULT_VALUE 6
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -561,7 +570,7 @@ ...@@ -561,7 +570,7 @@
VARIABLE_COMMENT Default pointer size to be used for MyISAM tables VARIABLE_COMMENT Default pointer size to be used for MyISAM tables
NUMERIC_MIN_VALUE 2 NUMERIC_MIN_VALUE 2
NUMERIC_MAX_VALUE 7 NUMERIC_MAX_VALUE 7
@@ -2195,9 +2195,9 @@ @@ -2209,9 +2209,9 @@
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME MYISAM_MAX_SORT_FILE_SIZE VARIABLE_NAME MYISAM_MAX_SORT_FILE_SIZE
SESSION_VALUE NULL SESSION_VALUE NULL
...@@ -573,7 +582,7 @@ ...@@ -573,7 +582,7 @@
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this VARIABLE_COMMENT Don't use the fast sort index method to created index if the temporary file would get bigger than this
@@ -2209,14 +2209,14 @@ @@ -2223,14 +2223,14 @@
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME MYISAM_MMAP_SIZE VARIABLE_NAME MYISAM_MMAP_SIZE
SESSION_VALUE NULL SESSION_VALUE NULL
...@@ -591,7 +600,7 @@ ...@@ -591,7 +600,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
@@ -2241,10 +2241,10 @@ @@ -2255,10 +2255,10 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1 DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -604,7 +613,7 @@ ...@@ -604,7 +613,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -2258,7 +2258,7 @@ @@ -2272,7 +2272,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE VARIABLE_COMMENT The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
NUMERIC_MIN_VALUE 4096 NUMERIC_MIN_VALUE 4096
...@@ -613,7 +622,7 @@ ...@@ -613,7 +622,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -2311,7 +2311,7 @@ @@ -2325,7 +2325,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 16384 DEFAULT_VALUE 16384
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -622,7 +631,7 @@ ...@@ -622,7 +631,7 @@
VARIABLE_COMMENT Buffer length for TCP/IP and socket communication VARIABLE_COMMENT Buffer length for TCP/IP and socket communication
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2325,7 +2325,7 @@ @@ -2339,7 +2339,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 30 DEFAULT_VALUE 30
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -631,7 +640,7 @@ ...@@ -631,7 +640,7 @@
VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read VARIABLE_COMMENT Number of seconds to wait for more data from a connection before aborting the read
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
@@ -2339,7 +2339,7 @@ @@ -2353,7 +2353,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 10 DEFAULT_VALUE 10
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -640,7 +649,7 @@ ...@@ -640,7 +649,7 @@
VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up VARIABLE_COMMENT If a read on a communication port is interrupted, retry this many times before giving up
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2353,7 +2353,7 @@ @@ -2367,7 +2367,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 60 DEFAULT_VALUE 60
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -649,7 +658,7 @@ ...@@ -649,7 +658,7 @@
VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write VARIABLE_COMMENT Number of seconds to wait for a block to be written to a connection before aborting the write
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
@@ -2423,7 +2423,7 @@ @@ -2437,7 +2437,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1 DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -658,7 +667,7 @@ ...@@ -658,7 +667,7 @@
VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows VARIABLE_COMMENT Controls the heuristic(s) applied during query optimization to prune less-promising partial plans from the optimizer search space. Meaning: 0 - do not apply any heuristic, thus perform exhaustive search; 1 - prune plans based on number of retrieved rows
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1 NUMERIC_MAX_VALUE 1
@@ -2437,7 +2437,7 @@ @@ -2451,7 +2451,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 62 DEFAULT_VALUE 62
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -667,7 +676,7 @@ ...@@ -667,7 +676,7 @@
VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value VARIABLE_COMMENT Maximum depth of search performed by the query optimizer. Values larger than the number of relations in a query result in better query plans, but take longer to compile a query. Values smaller than the number of tables in a relation result in faster optimization, but may produce very bad query plans. If set to 0, the system will automatically pick a reasonable value
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 62 NUMERIC_MAX_VALUE 62
@@ -2451,7 +2451,7 @@ @@ -2465,7 +2465,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 100 DEFAULT_VALUE 100
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -676,7 +685,7 @@ ...@@ -676,7 +685,7 @@
VARIABLE_COMMENT Controls number of record samples to check condition selectivity VARIABLE_COMMENT Controls number of record samples to check condition selectivity
NUMERIC_MIN_VALUE 10 NUMERIC_MIN_VALUE 10
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -2479,7 +2479,7 @@ @@ -2493,7 +2493,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1 DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -685,7 +694,7 @@ ...@@ -685,7 +694,7 @@
VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples VARIABLE_COMMENT Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join, 4 - use histograms to calculate selectivity of range conditions that are not backed by any index to calculate the cardinality of a partial join.5 - additionally use selectivity of certain non-range predicates calculated on record samples
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 5 NUMERIC_MAX_VALUE 5
@@ -2507,7 +2507,7 @@ @@ -2521,7 +2521,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -694,7 +703,7 @@ ...@@ -694,7 +703,7 @@
VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented user@host accounts. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2521,7 +2521,7 @@ @@ -2535,7 +2535,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -703,7 +712,7 @@ ...@@ -703,7 +712,7 @@
VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Size of the statement digest. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 200 NUMERIC_MAX_VALUE 200
@@ -2535,7 +2535,7 @@ @@ -2549,7 +2549,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -712,7 +721,7 @@ ...@@ -712,7 +721,7 @@
VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2549,7 +2549,7 @@ @@ -2563,7 +2563,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -721,7 +730,7 @@ ...@@ -721,7 +730,7 @@
VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024 NUMERIC_MAX_VALUE 1024
@@ -2563,7 +2563,7 @@ @@ -2577,7 +2577,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -730,7 +739,7 @@ ...@@ -730,7 +739,7 @@
VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2577,7 +2577,7 @@ @@ -2591,7 +2591,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -739,7 +748,7 @@ ...@@ -739,7 +748,7 @@
VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows per thread in EVENTS_STATEMENTS_HISTORY. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024 NUMERIC_MAX_VALUE 1024
@@ -2591,7 +2591,7 @@ @@ -2605,7 +2605,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -748,7 +757,7 @@ ...@@ -748,7 +757,7 @@
VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2605,7 +2605,7 @@ @@ -2619,7 +2619,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -757,7 +766,7 @@ ...@@ -757,7 +766,7 @@
VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1024 NUMERIC_MAX_VALUE 1024
@@ -2619,7 +2619,7 @@ @@ -2633,7 +2633,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -766,7 +775,7 @@ ...@@ -766,7 +775,7 @@
VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented hosts. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2633,7 +2633,7 @@ @@ -2647,7 +2647,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 80 DEFAULT_VALUE 80
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -775,7 +784,7 @@ ...@@ -775,7 +784,7 @@
VARIABLE_COMMENT Maximum number of condition instruments. VARIABLE_COMMENT Maximum number of condition instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2647,7 +2647,7 @@ @@ -2661,7 +2661,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -784,7 +793,7 @@ ...@@ -784,7 +793,7 @@
VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented condition objects. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2661,7 +2661,7 @@ @@ -2675,7 +2675,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1024 DEFAULT_VALUE 1024
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -793,7 +802,7 @@ ...@@ -793,7 +802,7 @@
VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables. VARIABLE_COMMENT Maximum length considered for digest text, when stored in performance_schema tables.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2675,7 +2675,7 @@ @@ -2689,7 +2689,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 50 DEFAULT_VALUE 50
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -802,7 +811,7 @@ ...@@ -802,7 +811,7 @@
VARIABLE_COMMENT Maximum number of file instruments. VARIABLE_COMMENT Maximum number of file instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2689,7 +2689,7 @@ @@ -2703,7 +2703,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 32768 DEFAULT_VALUE 32768
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -811,7 +820,7 @@ ...@@ -811,7 +820,7 @@
VARIABLE_COMMENT Maximum number of opened instrumented files. VARIABLE_COMMENT Maximum number of opened instrumented files.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2703,7 +2703,7 @@ @@ -2717,7 +2717,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -820,7 +829,7 @@ ...@@ -820,7 +829,7 @@
VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented files. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2717,7 +2717,7 @@ @@ -2731,7 +2731,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 200 DEFAULT_VALUE 200
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -829,7 +838,7 @@ ...@@ -829,7 +838,7 @@
VARIABLE_COMMENT Maximum number of mutex instruments. VARIABLE_COMMENT Maximum number of mutex instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2731,7 +2731,7 @@ @@ -2745,7 +2745,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -838,7 +847,7 @@ ...@@ -838,7 +847,7 @@
VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented MUTEX objects. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600 NUMERIC_MAX_VALUE 104857600
@@ -2745,7 +2745,7 @@ @@ -2759,7 +2759,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 40 DEFAULT_VALUE 40
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -847,7 +856,7 @@ ...@@ -847,7 +856,7 @@
VARIABLE_COMMENT Maximum number of rwlock instruments. VARIABLE_COMMENT Maximum number of rwlock instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2759,7 +2759,7 @@ @@ -2773,7 +2773,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -856,7 +865,7 @@ ...@@ -856,7 +865,7 @@
VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented RWLOCK objects. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 104857600 NUMERIC_MAX_VALUE 104857600
@@ -2773,7 +2773,7 @@ @@ -2787,7 +2787,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 10 DEFAULT_VALUE 10
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -865,7 +874,7 @@ ...@@ -865,7 +874,7 @@
VARIABLE_COMMENT Maximum number of socket instruments. VARIABLE_COMMENT Maximum number of socket instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2787,7 +2787,7 @@ @@ -2801,7 +2801,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -874,7 +883,7 @@ ...@@ -874,7 +883,7 @@
VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of opened instrumented sockets. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2801,7 +2801,7 @@ @@ -2815,7 +2815,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 150 DEFAULT_VALUE 150
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -883,7 +892,7 @@ ...@@ -883,7 +892,7 @@
VARIABLE_COMMENT Maximum number of stage instruments. VARIABLE_COMMENT Maximum number of stage instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2815,7 +2815,7 @@ @@ -2829,7 +2829,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 184 DEFAULT_VALUE 184
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -892,7 +901,7 @@ ...@@ -892,7 +901,7 @@
VARIABLE_COMMENT Maximum number of statement instruments. VARIABLE_COMMENT Maximum number of statement instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2829,7 +2829,7 @@ @@ -2843,7 +2843,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -901,7 +910,7 @@ ...@@ -901,7 +910,7 @@
VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of opened instrumented tables. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2843,7 +2843,7 @@ @@ -2857,7 +2857,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -910,7 +919,7 @@ ...@@ -910,7 +919,7 @@
VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented tables. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2857,7 +2857,7 @@ @@ -2871,7 +2871,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 50 DEFAULT_VALUE 50
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -919,7 +928,7 @@ ...@@ -919,7 +928,7 @@
VARIABLE_COMMENT Maximum number of thread instruments. VARIABLE_COMMENT Maximum number of thread instruments.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 256 NUMERIC_MAX_VALUE 256
@@ -2871,7 +2871,7 @@ @@ -2885,7 +2885,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -928,7 +937,7 @@ ...@@ -928,7 +937,7 @@
VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented threads. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2885,7 +2885,7 @@ @@ -2899,7 +2899,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -937,7 +946,7 @@ ...@@ -937,7 +946,7 @@
VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Size of session attribute string buffer per thread. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2899,7 +2899,7 @@ @@ -2913,7 +2913,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 100 DEFAULT_VALUE 100
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -946,7 +955,7 @@ ...@@ -946,7 +955,7 @@
VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS. VARIABLE_COMMENT Maximum number of rows in SETUP_ACTORS.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1024 NUMERIC_MAX_VALUE 1024
@@ -2913,7 +2913,7 @@ @@ -2927,7 +2927,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 100 DEFAULT_VALUE 100
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -955,7 +964,7 @@ ...@@ -955,7 +964,7 @@
VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS. VARIABLE_COMMENT Maximum number of rows in SETUP_OBJECTS.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2927,7 +2927,7 @@ @@ -2941,7 +2941,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE -1 DEFAULT_VALUE -1
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -964,7 +973,7 @@ ...@@ -964,7 +973,7 @@
VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing. VARIABLE_COMMENT Maximum number of instrumented users. Use 0 to disable, -1 for automated sizing.
NUMERIC_MIN_VALUE -1 NUMERIC_MIN_VALUE -1
NUMERIC_MAX_VALUE 1048576 NUMERIC_MAX_VALUE 1048576
@@ -2997,7 +2997,7 @@ @@ -3011,7 +3011,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 32768 DEFAULT_VALUE 32768
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -973,7 +982,7 @@ ...@@ -973,7 +982,7 @@
VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes VARIABLE_COMMENT The size of the buffer that is allocated when preloading indexes
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 1073741824 NUMERIC_MAX_VALUE 1073741824
@@ -3025,7 +3025,7 @@ @@ -3039,7 +3039,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 15 DEFAULT_VALUE 15
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -982,7 +991,7 @@ ...@@ -982,7 +991,7 @@
VARIABLE_COMMENT Limit of query profiling memory VARIABLE_COMMENT Limit of query profiling memory
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100 NUMERIC_MAX_VALUE 100
@@ -3039,7 +3039,7 @@ @@ -3053,7 +3053,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 5 DEFAULT_VALUE 5
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -991,7 +1000,7 @@ ...@@ -991,7 +1000,7 @@
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting. VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3109,7 +3109,7 @@ @@ -3123,7 +3123,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 16384 DEFAULT_VALUE 16384
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1000,7 +1009,7 @@ ...@@ -1000,7 +1009,7 @@
VARIABLE_COMMENT Allocation block size for query parsing and execution VARIABLE_COMMENT Allocation block size for query parsing and execution
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3123,7 +3123,7 @@ @@ -3137,7 +3137,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1048576 DEFAULT_VALUE 1048576
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1009,7 +1018,7 @@ ...@@ -1009,7 +1018,7 @@
VARIABLE_COMMENT Don't cache results that are bigger than this VARIABLE_COMMENT Don't cache results that are bigger than this
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3137,7 +3137,7 @@ @@ -3151,7 +3151,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4096 DEFAULT_VALUE 4096
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1018,7 +1027,7 @@ ...@@ -1018,7 +1027,7 @@
VARIABLE_COMMENT The minimum size for blocks allocated by the query cache VARIABLE_COMMENT The minimum size for blocks allocated by the query cache
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3154,7 +3154,7 @@ @@ -3168,7 +3168,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The memory allocated to store results from old queries VARIABLE_COMMENT The memory allocated to store results from old queries
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
...@@ -1027,7 +1036,7 @@ ...@@ -1027,7 +1036,7 @@
NUMERIC_BLOCK_SIZE 1024 NUMERIC_BLOCK_SIZE 1024
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -3207,7 +3207,7 @@ @@ -3221,7 +3221,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 24576 DEFAULT_VALUE 24576
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1036,7 +1045,7 @@ ...@@ -1036,7 +1045,7 @@
VARIABLE_COMMENT Persistent buffer for query parsing and execution VARIABLE_COMMENT Persistent buffer for query parsing and execution
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3221,7 +3221,7 @@ @@ -3235,7 +3235,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4096 DEFAULT_VALUE 4096
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1045,7 +1054,7 @@ ...@@ -1045,7 +1054,7 @@
VARIABLE_COMMENT Allocation block size for storing ranges during optimization VARIABLE_COMMENT Allocation block size for storing ranges during optimization
NUMERIC_MIN_VALUE 4096 NUMERIC_MIN_VALUE 4096
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3235,7 +3235,7 @@ @@ -3249,7 +3249,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 131072 DEFAULT_VALUE 131072
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1054,7 +1063,7 @@ ...@@ -1054,7 +1063,7 @@
VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value VARIABLE_COMMENT Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value
NUMERIC_MIN_VALUE 8192 NUMERIC_MIN_VALUE 8192
NUMERIC_MAX_VALUE 2147483647 NUMERIC_MAX_VALUE 2147483647
@@ -3263,7 +3263,7 @@ @@ -3277,7 +3277,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 262144 DEFAULT_VALUE 262144
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1063,7 +1072,7 @@ ...@@ -1063,7 +1072,7 @@
VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks VARIABLE_COMMENT When reading rows in sorted order after a sort, the rows are read through this buffer to avoid a disk seeks
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 2147483647 NUMERIC_MAX_VALUE 2147483647
@@ -3277,10 +3277,10 @@ @@ -3291,10 +3291,10 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 8388608 DEFAULT_VALUE 8388608
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1076,7 +1085,7 @@ ...@@ -1076,7 +1085,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -3319,7 +3319,7 @@ @@ -3333,7 +3333,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE 1 DEFAULT_VALUE 1
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1085,7 +1094,7 @@ ...@@ -1085,7 +1094,7 @@
VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -3417,7 +3417,7 @@ @@ -3431,7 +3431,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 1073741824 DEFAULT_VALUE 1073741824
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1094,7 +1103,7 @@ ...@@ -1094,7 +1103,7 @@
VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave. VARIABLE_COMMENT The maximum packet length to sent successfully from the master to slave.
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 1073741824 NUMERIC_MAX_VALUE 1073741824
@@ -3431,7 +3431,7 @@ @@ -3445,7 +3445,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 2 DEFAULT_VALUE 2
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1103,7 +1112,7 @@ ...@@ -1103,7 +1112,7 @@
VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented VARIABLE_COMMENT If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
@@ -3490,7 +3490,7 @@ @@ -3504,7 +3504,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size VARIABLE_COMMENT Each thread that needs to do a sort allocates a buffer of this size
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
...@@ -1112,7 +1121,7 @@ ...@@ -1112,7 +1121,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -3767,7 +3767,7 @@ @@ -3795,7 +3795,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 256 DEFAULT_VALUE 256
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1121,7 +1130,7 @@ ...@@ -1121,7 +1130,7 @@
VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection. VARIABLE_COMMENT The soft upper limit for number of cached stored routines for one connection.
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 524288 NUMERIC_MAX_VALUE 524288
@@ -3837,7 +3837,7 @@ @@ -3865,7 +3865,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 400 DEFAULT_VALUE 400
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1130,7 +1139,7 @@ ...@@ -1130,7 +1139,7 @@
VARIABLE_COMMENT The number of cached table definitions VARIABLE_COMMENT The number of cached table definitions
NUMERIC_MIN_VALUE 400 NUMERIC_MIN_VALUE 400
NUMERIC_MAX_VALUE 524288 NUMERIC_MAX_VALUE 524288
@@ -3851,7 +3851,7 @@ @@ -3879,7 +3879,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 2000 DEFAULT_VALUE 2000
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1139,7 +1148,7 @@ ...@@ -1139,7 +1148,7 @@
VARIABLE_COMMENT The number of cached open tables VARIABLE_COMMENT The number of cached open tables
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 524288 NUMERIC_MAX_VALUE 524288
@@ -3865,7 +3865,7 @@ @@ -3893,7 +3893,7 @@
GLOBAL_VALUE_ORIGIN AUTO GLOBAL_VALUE_ORIGIN AUTO
DEFAULT_VALUE 256 DEFAULT_VALUE 256
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1148,7 +1157,7 @@ ...@@ -1148,7 +1157,7 @@
VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time VARIABLE_COMMENT How many threads we should keep in a cache for reuse. These are freed after 5 minutes of idle time
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 16384 NUMERIC_MAX_VALUE 16384
@@ -3879,7 +3879,7 @@ @@ -3907,7 +3907,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 10 DEFAULT_VALUE 10
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1157,7 +1166,7 @@ ...@@ -1157,7 +1166,7 @@
VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release. VARIABLE_COMMENT Permits the application to give the threads system a hint for the desired number of threads that should be run at the same time.This variable has no effect, and is deprecated. It will be removed in a future release.
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 512 NUMERIC_MAX_VALUE 512
@@ -3994,7 +3994,7 @@ @@ -4022,7 +4022,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table VARIABLE_COMMENT If an internal in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM or Aria table
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
...@@ -1166,7 +1175,7 @@ ...@@ -1166,7 +1175,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -4005,7 +4005,7 @@ @@ -4033,7 +4033,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 8192 DEFAULT_VALUE 8192
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1175,7 +1184,7 @@ ...@@ -1175,7 +1184,7 @@
VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log VARIABLE_COMMENT Allocation block size for transactions to be stored in binary log
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 134217728 NUMERIC_MAX_VALUE 134217728
@@ -4019,7 +4019,7 @@ @@ -4047,7 +4047,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4096 DEFAULT_VALUE 4096
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1184,7 +1193,7 @@ ...@@ -1184,7 +1193,7 @@
VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log VARIABLE_COMMENT Persistent buffer for transactions to be stored in binary log
NUMERIC_MIN_VALUE 1024 NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE 134217728 NUMERIC_MAX_VALUE 134217728
@@ -4117,7 +4117,7 @@ @@ -4145,7 +4145,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 28800 DEFAULT_VALUE 28800
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
...@@ -1193,7 +1202,7 @@ ...@@ -1193,7 +1202,7 @@
VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it VARIABLE_COMMENT The number of seconds the server waits for activity on a connection before closing it
NUMERIC_MIN_VALUE 1 NUMERIC_MIN_VALUE 1
NUMERIC_MAX_VALUE 31536000 NUMERIC_MAX_VALUE 31536000
@@ -4221,7 +4221,7 @@ @@ -4249,7 +4249,7 @@
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME OPEN_FILES_LIMIT VARIABLE_NAME OPEN_FILES_LIMIT
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
...@@ -1202,7 +1211,7 @@ ...@@ -1202,7 +1211,7 @@
VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors VARIABLE_COMMENT If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295 NUMERIC_MAX_VALUE 4294967295
@@ -4234,7 +4234,7 @@ @@ -4262,7 +4262,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
...@@ -1211,7 +1220,7 @@ ...@@ -1211,7 +1220,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -4244,7 +4244,7 @@ @@ -4272,7 +4272,7 @@
VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes VARIABLE_COMMENT Sets the internal state of the RAND() generator for replication purposes
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
...@@ -1220,7 +1229,7 @@ ...@@ -1220,7 +1229,7 @@
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
@@ -4329,7 +4329,7 @@ @@ -4357,7 +4357,7 @@
VARIABLE_NAME LOG_TC_SIZE VARIABLE_NAME LOG_TC_SIZE
GLOBAL_VALUE_ORIGIN AUTO GLOBAL_VALUE_ORIGIN AUTO
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
......
strings/conf_to_src.c
View file @ 9fc23586
...@@ -25,7 +25,17 @@ ...@@ -25,7 +25,17 @@
#define ROW16_LEN 8 #define ROW16_LEN 8
#define MAX_BUF (64*1024) #define MAX_BUF (64*1024)
static struct charset_info_st all_charsets[512];
#define MY_ALL_CHARSETS_SIZE 2048
static struct charset_info_st all_charsets[MY_ALL_CHARSETS_SIZE];
static uint refids[MY_ALL_CHARSETS_SIZE];
static CHARSET_INFO *inheritance_source(uint id)
{
return &all_charsets[refids[id]];
}
void void
print_array(FILE *f, const char *set, const char *name, const uchar *a, int n) print_array(FILE *f, const char *set, const char *name, const uchar *a, int n)
...@@ -61,14 +71,30 @@ print_array16(FILE *f, const char *set, const char *name, const uint16 *a, int n ...@@ -61,14 +71,30 @@ print_array16(FILE *f, const char *set, const char *name, const uint16 *a, int n
} }
static int get_charset_number(const char *charset_name) static uint get_collation_number(const char *name)
{ {
CHARSET_INFO *cs; CHARSET_INFO *cs;
for (cs= all_charsets; for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets); cs < all_charsets + array_elements(all_charsets);
cs++) cs++)
{ {
if ( cs->name && !strcmp(cs->name, charset_name)) if (cs->name && !strcmp(cs->name, name))
return cs->number;
}
return 0;
}
static uint
get_charset_number_internal(const char *charset_name, uint cs_flags)
{
CHARSET_INFO *cs;
for (cs= all_charsets;
cs < all_charsets + array_elements(all_charsets);
cs++)
{
if (cs->csname && (cs->state & cs_flags) &&
!strcmp(cs->csname, charset_name))
return cs->number; return cs->number;
} }
return 0; return 0;
...@@ -117,6 +143,25 @@ static void simple_cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from) ...@@ -117,6 +143,25 @@ static void simple_cs_copy_data(struct charset_info_st *to, CHARSET_INFO *from)
} }
} }
static void inherit_data(struct charset_info_st *cs, CHARSET_INFO *refcs)
{
if (refcs->ctype &&
!memcmp(cs->ctype, refcs->ctype, MY_CS_CTYPE_TABLE_SIZE))
cs->ctype= NULL;
if (refcs->to_lower &&
!memcmp(cs->to_lower, refcs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE))
cs->to_lower= NULL;
if (refcs->to_upper &&
!memcmp(cs->to_upper, refcs->to_upper, MY_CS_TO_LOWER_TABLE_SIZE))
cs->to_upper= NULL;
if (refcs->tab_to_uni &&
!memcmp(cs->tab_to_uni, refcs->tab_to_uni,
MY_CS_TO_UNI_TABLE_SIZE * sizeof(uint16)))
cs->tab_to_uni= NULL;
}
static my_bool simple_cs_is_full(CHARSET_INFO *cs) static my_bool simple_cs_is_full(CHARSET_INFO *cs)
{ {
return ((cs->csname && cs->tab_to_uni && cs->ctype && cs->to_upper && return ((cs->csname && cs->tab_to_uni && cs->ctype && cs->to_upper &&
...@@ -127,7 +172,8 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs) ...@@ -127,7 +172,8 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs)
static int add_collation(struct charset_info_st *cs) static int add_collation(struct charset_info_st *cs)
{ {
if (cs->name && (cs->number || (cs->number=get_charset_number(cs->name)))) if (cs->name &&
(cs->number || (cs->number= get_collation_number(cs->name))))
{ {
if (!(all_charsets[cs->number].state & MY_CS_COMPILED)) if (!(all_charsets[cs->number].state & MY_CS_COMPILED))
{ {
...@@ -194,34 +240,53 @@ static int my_read_charset_file(const char *filename) ...@@ -194,34 +240,53 @@ static int my_read_charset_file(const char *filename)
} }
void print_arrays(FILE *f, CHARSET_INFO *cs)
{
if (cs->ctype)
print_array(f, cs->name, "ctype", cs->ctype, MY_CS_CTYPE_TABLE_SIZE);
if (cs->to_lower)
print_array(f, cs->name, "to_lower", cs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE);
if (cs->to_upper)
print_array(f, cs->name, "to_upper", cs->to_upper, MY_CS_TO_UPPER_TABLE_SIZE);
if (cs->sort_order)
print_array(f, cs->name, "sort_order", cs->sort_order, MY_CS_SORT_ORDER_TABLE_SIZE);
if (cs->tab_to_uni)
print_array16(f, cs->name, "to_uni", cs->tab_to_uni, MY_CS_TO_UNI_TABLE_SIZE);
}
void dispcset(FILE *f,CHARSET_INFO *cs) void dispcset(FILE *f,CHARSET_INFO *cs)
{ {
uint flags= my_8bit_charset_flags_from_data(cs) |
my_8bit_collation_flags_from_data(cs);
fprintf(f,"{\n"); fprintf(f,"{\n");
fprintf(f," %d,%d,%d,\n",cs->number,0,0); fprintf(f," %d,%d,%d,\n",cs->number,0,0);
fprintf(f," MY_CS_COMPILED%s%s%s%s%s,\n", fprintf(f," MY_CS_COMPILED%s%s%s%s%s,\n",
cs->state & MY_CS_BINSORT ? "|MY_CS_BINSORT" : "", cs->state & MY_CS_BINSORT ? "|MY_CS_BINSORT" : "",
cs->state & MY_CS_PRIMARY ? "|MY_CS_PRIMARY" : "", cs->state & MY_CS_PRIMARY ? "|MY_CS_PRIMARY" : "",
flags & MY_CS_CSSORT ? "|MY_CS_CSSORT" : "", cs->state & MY_CS_CSSORT ? "|MY_CS_CSSORT" : "",
flags & MY_CS_PUREASCII ? "|MY_CS_PUREASCII" : "", cs->state & MY_CS_PUREASCII ? "|MY_CS_PUREASCII" : "",
flags & MY_CS_NONASCII ? "|MY_CS_NONASCII" : ""); cs->state & MY_CS_NONASCII ? "|MY_CS_NONASCII" : "");
if (cs->name) if (cs->name)
{ {
CHARSET_INFO *srccs= inheritance_source(cs->number);
fprintf(f," \"%s\", /* cset name */\n",cs->csname); fprintf(f," \"%s\", /* cset name */\n",cs->csname);
fprintf(f," \"%s\", /* coll name */\n",cs->name); fprintf(f," \"%s\", /* coll name */\n",cs->name);
fprintf(f," \"\", /* comment */\n"); fprintf(f," \"\", /* comment */\n");
fprintf(f," NULL, /* tailoring */\n"); fprintf(f," NULL, /* tailoring */\n");
fprintf(f," ctype_%s, /* ctype */\n",cs->name);
fprintf(f," to_lower_%s, /* lower */\n",cs->name); fprintf(f," ctype_%s, /* ctype */\n",
fprintf(f," to_upper_%s, /* upper */\n",cs->name); cs->ctype ? cs->name : srccs->name);
fprintf(f," to_lower_%s, /* lower */\n",
cs->to_lower ? cs->name : srccs->name);
fprintf(f," to_upper_%s, /* upper */\n",
cs->to_upper ? cs->name : srccs->name);
if (cs->sort_order) if (cs->sort_order)
fprintf(f," sort_order_%s, /* sort_order */\n",cs->name); fprintf(f," sort_order_%s, /* sort_order */\n",cs->name);
else else
fprintf(f," NULL, /* sort_order */\n"); fprintf(f," NULL, /* sort_order */\n");
fprintf(f," NULL, /* uca */\n"); fprintf(f," NULL, /* uca */\n");
fprintf(f," to_uni_%s, /* to_uni */\n",cs->name); fprintf(f," to_uni_%s, /* to_uni */\n",
cs->tab_to_uni ? cs->name : srccs->name);
} }
else else
{ {
...@@ -265,8 +330,8 @@ fprint_copyright(FILE *file) ...@@ -265,8 +330,8 @@ fprint_copyright(FILE *file)
{ {
fprintf(file, fprintf(file,
"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n" "/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
" Copyright 2010-2011 Monty Program Ab\n"
" Copyright (c) 2000, 2011, Oracle and/or its affiliates.\n" " Copyright (c) 2000, 2011, Oracle and/or its affiliates.\n"
" Copyright 2008-2016 MariaDB Corporation\n"
"\n" "\n"
" This program is free software; you can redistribute it and/or modify\n" " This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n" " it under the terms of the GNU General Public License as published by\n"
...@@ -287,8 +352,7 @@ fprint_copyright(FILE *file) ...@@ -287,8 +352,7 @@ fprint_copyright(FILE *file)
int int
main(int argc, char **argv __attribute__((unused))) main(int argc, char **argv __attribute__((unused)))
{ {
struct charset_info_st ncs; struct charset_info_st ncs, *cs;
CHARSET_INFO *cs;
char filename[256]; char filename[256];
FILE *f= stdout; FILE *f= stdout;
...@@ -300,6 +364,7 @@ main(int argc, char **argv __attribute__((unused))) ...@@ -300,6 +364,7 @@ main(int argc, char **argv __attribute__((unused)))
bzero((void*)&ncs,sizeof(ncs)); bzero((void*)&ncs,sizeof(ncs));
bzero((void*)&all_charsets,sizeof(all_charsets)); bzero((void*)&all_charsets,sizeof(all_charsets));
bzero((void*) refids, sizeof(refids));
sprintf(filename,"%s/%s",argv[1],"Index.xml"); sprintf(filename,"%s/%s",argv[1],"Index.xml");
my_read_charset_file(filename); my_read_charset_file(filename);
...@@ -315,6 +380,7 @@ main(int argc, char **argv __attribute__((unused))) ...@@ -315,6 +380,7 @@ main(int argc, char **argv __attribute__((unused)))
sprintf(filename,"%s/%s.xml",argv[1],cs->csname); sprintf(filename,"%s/%s.xml",argv[1],cs->csname);
my_read_charset_file(filename); my_read_charset_file(filename);
} }
cs->state|= MY_CS_LOADED;
} }
} }
...@@ -335,15 +401,19 @@ main(int argc, char **argv __attribute__((unused))) ...@@ -335,15 +401,19 @@ main(int argc, char **argv __attribute__((unused)))
cs < all_charsets + array_elements(all_charsets); cs < all_charsets + array_elements(all_charsets);
cs++) cs++)
{ {
if (simple_cs_is_full(cs)) if (cs->state & MY_CS_LOADED)
{
uint refid= get_charset_number_internal(cs->csname, MY_CS_PRIMARY);
cs->state|= my_8bit_charset_flags_from_data(cs) |
my_8bit_collation_flags_from_data(cs);
if (refid && cs->number != refid)
{ {
CHARSET_INFO *refcs= &all_charsets[refid];
refids[cs->number]= refid;
inherit_data(cs, refcs);
}
fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname); fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname);
print_array(f, cs->name, "ctype", cs->ctype, MY_CS_CTYPE_TABLE_SIZE); print_arrays(f, cs);
print_array(f, cs->name, "to_lower", cs->to_lower, MY_CS_TO_LOWER_TABLE_SIZE);
print_array(f, cs->name, "to_upper", cs->to_upper, MY_CS_TO_UPPER_TABLE_SIZE);
if (cs->sort_order)
print_array(f, cs->name, "sort_order", cs->sort_order, MY_CS_SORT_ORDER_TABLE_SIZE);
print_array16(f, cs->name, "to_uni", cs->tab_to_uni, MY_CS_TO_UNI_TABLE_SIZE);
fprintf(f,"#endif\n"); fprintf(f,"#endif\n");
fprintf(f,"\n"); fprintf(f,"\n");
} }
...@@ -354,7 +424,7 @@ main(int argc, char **argv __attribute__((unused))) ...@@ -354,7 +424,7 @@ main(int argc, char **argv __attribute__((unused)))
cs < all_charsets + array_elements(all_charsets); cs < all_charsets + array_elements(all_charsets);
cs++) cs++)
{ {
if (simple_cs_is_full(cs)) if (cs->state & MY_CS_LOADED)
{ {
fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname); fprintf(f,"#ifdef HAVE_CHARSET_%s\n",cs->csname);
dispcset(f,cs); dispcset(f,cs);
......
strings/ctype-extra.c
View file @ 9fc23586
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7