From: Otto Kekäläinen Date: Mon, 4 Nov 2024 16:00:42 +0000 (-0800) Subject: Fix spelling of 'allows one to' X-Git-Tag: archive/raspbian/1%11.4.4-3+rpi1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=663f8abf95440daf17c16f4149117f0437315cf1;p=mariadb.git Fix spelling of 'allows one to' Fix the following Lintian nags introduced in commit c8d040938a7ebe10e62506a726702c5990ef4dda: I: mariadb-backup: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-backup] I: mariadb-server-core: spelling-error-in-binary "allows to" "allows one to" [usr/sbin/mariadbd] I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-client-test-embedded] I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-test-embedded] I: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/test-connect-t] Forwarded: no Gbp-Pq: Name Fix-spelling-of-of-allows-one-to.patch --- diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 9a1503986..223117b09 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -782,13 +782,14 @@ The following specify which files/extra groups are read (specified before remain storage as part of an index scan. --optimizer-join-limit-pref-ratio=# For queries with JOIN and ORDER BY LIMIT : make the - optimizer consider a join order that allows to short-cut - execution after producing #LIMIT matches if that promises - N times speedup. (A conservative setting here would be is - a high value, like 100 so the short-cutting plan is used - if it promises a speedup of 100x or more). Short-cutting - plans are inherently risky so the default is 0 which - means do not consider this optimization + optimizer consider a join order that allows one to + short-cut execution after producing #LIMIT matches if + that promises N times speedup. (A conservative setting + here would be is a high value, like 100 so the + short-cutting plan is used if it promises a speedup of + 100x or more). Short-cutting plans are inherently risky + so the default is 0 which means do not consider this + optimization --optimizer-key-compare-cost=# Cost of checking a key against the end key condition. --optimizer-key-copy-cost=# diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 0417b41b8..6531ce400 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2405,7 +2405,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_JOIN_LIMIT_PREF_RATIO VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization +VARIABLE_COMMENT For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows one to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 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 2cc1a6ba7..85d08d422 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -2615,7 +2615,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_JOIN_LIMIT_PREF_RATIO VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization +VARIABLE_COMMENT For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows one to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 17c0aac2b..665f41253 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11699,7 +11699,7 @@ double recompute_join_cost_with_limit(const JOIN *join, bool skip_sorting, /* @brief - Finalize building the join order which allows to short-cut the join + Finalize building the join order which allows one to short-cut the join execution. @detail diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9fd51fbe4..016459562 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2883,7 +2883,7 @@ static Sys_var_ulong Sys_optimizer_selectivity_sampling_limit( static Sys_var_ulonglong Sys_optimizer_join_limit_pref_ratio( "optimizer_join_limit_pref_ratio", "For queries with JOIN and ORDER BY LIMIT : make the optimizer " - "consider a join order that allows to short-cut execution after " + "consider a join order that allows one to short-cut execution after " "producing #LIMIT matches if that promises N times speedup. " "(A conservative setting here would be is a high value, like 100 so " "the short-cutting plan is used if it promises a speedup of 100x or "