summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-notwin.result
diff options
context:
space:
mode:
authorRoy Lyseng <roy.lyseng@sun.com>2010-03-01 17:31:02 +0100
committerRoy Lyseng <roy.lyseng@sun.com>2010-03-01 17:31:02 +0100
commitb71eb4192c961465872f226d71a5569b2334d369 (patch)
treef9f7d9c57f50ce46409ecddbcdab82c14e18f122 /mysql-test/r/mysqld--help-notwin.result
parentde39f438e39214cb43e0bc2a52c2f210c6218bf8 (diff)
downloadmariadb-git-b71eb4192c961465872f226d71a5569b2334d369.tar.gz
WL#5252: Deprecate --optimizer_search_depth=63
Add deprecation warning when variable optimizer_search_depth is given the value 63. mysql-test/r/greedy_optimizer.result Updated with warning text. mysql-test/r/mysqld--help-notwin.result Updated with warning from mysqld --help --verbose. mysql-test/r/mysqld--help-win.result Updated with warning from mysqld --help --verbose. sql/sys_vars.cc Added an update check function to the constructor invocation for the optimizer_search_depth variable. The function emits a warning message for the value 63.
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
-rw-r--r--mysql-test/r/mysqld--help-notwin.result5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 5c4a13a3c7e..711402c764f 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -396,8 +396,9 @@ The following options may be given as the first argument:
relation result in faster optimization, but may produce
very bad query plans. If set to 0, the system will
automatically pick a reasonable value; if set to 63, the
- optimizer will switch to the original find_best
- search(used for testing/comparison)
+ optimizer will switch to the original find_best search.
+ NOTE: The value 63 and its associated behaviour is
+ deprecated
--optimizer-switch=name
optimizer_switch=option=val[,option=val...], where option
is one of {index_merge, index_merge_union,