revision-id: 46684f3cd16224c4b54454c0f332959452f10eda (mariadb-10.3.6-227-g46684f3) parent(s): 500d909a795022255fb6f6c44cd310636afc0b5a author: Varun Gupta committer: Varun Gupta timestamp: 2019-03-13 13:39:07 +0530 message: 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 --- sql/mysqld.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bf1780e..7460a3b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6997,11 +6997,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