summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarun Gupta <varun.gupta@mariadb.com>2019-03-13 13:48:42 +0530
committerVarun Gupta <varun.gupta@mariadb.com>2019-03-13 14:31:13 +0530
commit52560b8b2dc4e2044cabe9f7b1b07168c6159832 (patch)
treedbeb17d4db180293022267e896f3f55438d4e36c
parentf9f625fb431129cd72655ea90bf90fddbf05e3c5 (diff)
downloadmariadb-git-52560b8b2dc4e2044cabe9f7b1b07168c6159832.tar.gz
MDEV-18905: Remove the warning "'optimizer-trace' is MySQL 5.6 / 5.7 compatible option"
Fixed, now server start with optimizer_trace enabled would not show the warning
-rw-r--r--sql/mysqld.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index fa9387ac51a..69dc1e5dc9d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7074,11 +7074,9 @@ struct my_option my_long_options[]=
MYSQL_COMPATIBILITY_OPTION("binlog-order-commits"),
MYSQL_TO_BE_IMPLEMENTED_OPTION("log-throttle-queries-not-using-indexes"),
MYSQL_TO_BE_IMPLEMENTED_OPTION("end-markers-in-json"),
- MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace"), // OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-features"), // OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-offset"), // OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-limit"), // OPTIMIZER_TRACE
- MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-max-mem-size"), // OPTIMIZER_TRACE
MYSQL_TO_BE_IMPLEMENTED_OPTION("eq-range-index-dive-limit"),
MYSQL_COMPATIBILITY_OPTION("server-id-bits"),
MYSQL_TO_BE_IMPLEMENTED_OPTION("slave-rows-search-algorithms"), // HAVE_REPLICATION