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 9a150398692c5a8446e8b43de0bffe23c7c552c5..223117b09cf5f0b16e13dca2a0ca99a998308f8f 100644 (file)
--- 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 0417b41b80f244c169e8bc893c4009f2cc6cbef7..6531ce4002e2c70125d8c713ec8acb5b8aff903a 100644 (file)
--- 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 2cc1a6ba7631243924ce00a55492d1709862c7db..85d08d422f34368a8aa7c0b9caa93158e5b34a3e 100644 (file)
--- 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 17c0aac2bffa117c394b170aa72a685923010b0f..665f4125383df26f25d2af871fdb8b9ff5e38bd4 100644 (file)
--- 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 9fd51fbe4a0f388920da73c4927da78338596aa2..016459562a0bd3bad64754d999135ee62044ae2d 100644 (file)
--- 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 "