From 5b19ff65b3cf5c7a8ac1a961629c49e6485c2c8d Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Thu, 4 Jul 2013 09:38:33 +0400 Subject: Update more test results (all checked). --- mysql-test/r/mysqld--help.result | 104 +++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 38 deletions(-) (limited to 'mysql-test/r/mysqld--help.result') diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 197743d6c6f..eb0c5a5501b 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -202,6 +202,7 @@ The following options may be given as the first argument: The maximum length of the result of function GROUP_CONCAT() -?, --help Display this help and exit. + --host-cache-size=# How many host names should be cached to avoid resolving. --ignore-builtin-innodb Disable initialization of builtin InnoDB plugin --ignore-db-dirs=name @@ -407,6 +408,8 @@ The following options may be given as the first argument: --memlock Lock mysqld in memory. --metadata-locks-cache-size=# Size of unused metadata locks cache + --metadata-locks-hash-instances=# + Number of metadata locks hash instances --min-examined-row-limit=# Don't write queries to slow log that examine fewer rows than that @@ -500,8 +503,10 @@ The following options may be given as the first argument: val is one of {on, off, default} --performance-schema Enable the performance schema. + (Defaults to on; use --skip-performance-schema to disable.) --performance-schema-accounts-size=# - Maximum number of instrumented user@host accounts. + Maximum number of instrumented user@host accounts. Use 0 + to disable, -1 for automated sizing. --performance-schema-consumer-events-stages-current Default startup value for the events_stages_current consumer. @@ -542,64 +547,84 @@ The following options may be given as the first argument: consumer. (Defaults to on; use --skip-performance-schema-consumer-thread-instrumentation to disable.) --performance-schema-digests-size=# - Size of the statement digest. + Size of the statement digest. Use 0 to disable, -1 for + automated sizing. --performance-schema-events-stages-history-long-size=# - Number of rows in EVENTS_STAGES_HISTORY_LONG. + Number of rows in EVENTS_STAGES_HISTORY_LONG. Use 0 to + disable, -1 for automated sizing. --performance-schema-events-stages-history-size=# - Number of rows per thread in EVENTS_STAGES_HISTORY. + Number of rows per thread in EVENTS_STAGES_HISTORY. Use 0 + to disable, -1 for automated sizing. --performance-schema-events-statements-history-long-size=# - Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. + Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. Use 0 + to disable, -1 for automated sizing. --performance-schema-events-statements-history-size=# Number of rows per thread in EVENTS_STATEMENTS_HISTORY. + Use 0 to disable, -1 for automated sizing. --performance-schema-events-waits-history-long-size=# - Number of rows in EVENTS_WAITS_HISTORY_LONG. + Number of rows in EVENTS_WAITS_HISTORY_LONG. Use 0 to + disable, -1 for automated sizing. --performance-schema-events-waits-history-size=# - Number of rows per thread in EVENTS_WAITS_HISTORY. + Number of rows per thread in EVENTS_WAITS_HISTORY. Use 0 + to disable, -1 for automated sizing. --performance-schema-hosts-size=# - Maximum number of instrumented hosts. + Maximum number of instrumented hosts. Use 0 to disable, + -1 for automated sizing. --performance-schema-instrument[=name] Default startup value for a performance schema instrument. --performance-schema-max-cond-classes=# Maximum number of condition instruments. --performance-schema-max-cond-instances=# - Maximum number of instrumented condition objects. + Maximum number of instrumented condition objects. Use 0 + to disable, -1 for automated sizing. --performance-schema-max-file-classes=# Maximum number of file instruments. --performance-schema-max-file-handles=# Maximum number of opened instrumented files. --performance-schema-max-file-instances=# - Maximum number of instrumented files. + Maximum number of instrumented files. Use 0 to disable, + -1 for automated sizing. --performance-schema-max-mutex-classes=# Maximum number of mutex instruments. --performance-schema-max-mutex-instances=# - Maximum number of instrumented MUTEX objects. + Maximum number of instrumented MUTEX objects. Use 0 to + disable, -1 for automated sizing. --performance-schema-max-rwlock-classes=# Maximum number of rwlock instruments. --performance-schema-max-rwlock-instances=# - Maximum number of instrumented RWLOCK objects. + Maximum number of instrumented RWLOCK objects. Use 0 to + disable, -1 for automated sizing. --performance-schema-max-socket-classes=# Maximum number of socket instruments. --performance-schema-max-socket-instances=# - Maximum number of opened instrumented sockets. + Maximum number of opened instrumented sockets. Use 0 to + disable, -1 for automated sizing. --performance-schema-max-stage-classes=# Maximum number of stage instruments. --performance-schema-max-statement-classes=# Maximum number of statement instruments. --performance-schema-max-table-handles=# - Maximum number of opened instrumented tables. + Maximum number of opened instrumented tables. Use 0 to + disable, -1 for automated sizing. --performance-schema-max-table-instances=# - Maximum number of instrumented tables. + Maximum number of instrumented tables. Use 0 to disable, + -1 for automated sizing. --performance-schema-max-thread-classes=# Maximum number of thread instruments. --performance-schema-max-thread-instances=# - Maximum number of instrumented threads. + Maximum number of instrumented threads. Use 0 to disable, + -1 for automated sizing. + --performance-schema-session-connect-attrs-size=# + Size of session attribute string buffer per thread. Use 0 + to disable, -1 for automated sizing. --performance-schema-setup-actors-size=# Maximum number of rows in SETUP_ACTORS. --performance-schema-setup-objects-size=# Maximum number of rows in SETUP_OBJECTS. --performance-schema-users-size=# - Maximum number of instrumented users. + Maximum number of instrumented users. Use 0 to disable, + -1 for automated sizing. --pid-file=name Pid file used by safe_mysqld --plugin-dir=name Directory for plugins --plugin-load=name Semicolon-separated list of plugins to load, where each @@ -990,6 +1015,7 @@ gdb FALSE general-log FALSE group-concat-max-len 1024 help TRUE +host-cache-size 128 ignore-builtin-innodb FALSE ignore-db-dirs init-connect @@ -1039,7 +1065,7 @@ max-allowed-packet 1048576 max-binlog-cache-size 18446744073709547520 max-binlog-size 1073741824 max-binlog-stmt-cache-size 18446744073709547520 -max-connect-errors 10 +max-connect-errors 100 max-connections 151 max-delayed-threads 20 max-error-count 64 @@ -1057,6 +1083,7 @@ max-user-connections 0 max-write-lock-count 18446744073709551615 memlock FALSE metadata-locks-cache-size 1024 +metadata-locks-hash-instances 8 min-examined-row-limit 0 mrr-buffer-size 262144 multi-range-count 256 @@ -1080,8 +1107,8 @@ old-style-user-limits FALSE optimizer-prune-level 1 optimizer-search-depth 62 optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,engine_condition_pushdown=off,index_condition_pushdown=on,derived_merge=on,derived_with_keys=on,firstmatch=on,loosescan=on,materialization=on,in_to_exists=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr=off,mrr_cost_based=off,mrr_sort_keys=off,outer_join_with_cache=on,semijoin_with_cache=on,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,optimize_join_buffer_size=off,table_elimination=on -performance-schema FALSE -performance-schema-accounts-size 100 +performance-schema TRUE +performance-schema-accounts-size 10 performance-schema-consumer-events-stages-current FALSE performance-schema-consumer-events-stages-history FALSE performance-schema-consumer-events-stages-history-long FALSE @@ -1094,35 +1121,36 @@ performance-schema-consumer-events-waits-history-long FALSE performance-schema-consumer-global-instrumentation TRUE performance-schema-consumer-statements-digest TRUE performance-schema-consumer-thread-instrumentation TRUE -performance-schema-digests-size 200 -performance-schema-events-stages-history-long-size 10000 -performance-schema-events-stages-history-size 10 -performance-schema-events-statements-history-long-size 10000 -performance-schema-events-statements-history-size 10 -performance-schema-events-waits-history-long-size 10000 -performance-schema-events-waits-history-size 10 -performance-schema-hosts-size 100 +performance-schema-digests-size 1000 +performance-schema-events-stages-history-long-size 100 +performance-schema-events-stages-history-size 5 +performance-schema-events-statements-history-long-size 100 +performance-schema-events-statements-history-size 5 +performance-schema-events-waits-history-long-size 100 +performance-schema-events-waits-history-size 5 +performance-schema-hosts-size 20 performance-schema-instrument performance-schema-max-cond-classes 80 -performance-schema-max-cond-instances 1000 +performance-schema-max-cond-instances 836 performance-schema-max-file-classes 50 performance-schema-max-file-handles 32768 -performance-schema-max-file-instances 10000 +performance-schema-max-file-instances 1556 performance-schema-max-mutex-classes 200 -performance-schema-max-mutex-instances 1000000 +performance-schema-max-mutex-instances 3282 performance-schema-max-rwlock-classes 30 -performance-schema-max-rwlock-instances 1000000 +performance-schema-max-rwlock-instances 1724 performance-schema-max-socket-classes 10 -performance-schema-max-socket-instances 1000 +performance-schema-max-socket-instances 179 performance-schema-max-stage-classes 150 -performance-schema-max-statement-classes 173 -performance-schema-max-table-handles 10000 -performance-schema-max-table-instances 1000 +performance-schema-max-statement-classes 174 +performance-schema-max-table-handles 445 +performance-schema-max-table-instances 445 performance-schema-max-thread-classes 50 -performance-schema-max-thread-instances 1000 +performance-schema-max-thread-instances 224 +performance-schema-session-connect-attrs-size 512 performance-schema-setup-actors-size 100 performance-schema-setup-objects-size 100 -performance-schema-users-size 100 +performance-schema-users-size 5 plugin-maturity unknown port 3306 port-open-timeout 0 -- cgit v1.2.1 From 9388822c5d952a1b36d3c675acb8f0c0775b6757 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 25 Jul 2013 13:37:30 +0400 Subject: MDEV-4786 - merge 10.0-monty - 10.0 Fixed main.mysql--help failure. mysql-test/r/mysqld--help.result: PFS_MAX_RWLOCK_CLASS was raised to 40 during the merge. --- mysql-test/r/mysqld--help.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/mysqld--help.result') diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 5fec9b50596..610157502b9 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1196,7 +1196,7 @@ performance-schema-max-file-handles 32768 performance-schema-max-file-instances 1556 performance-schema-max-mutex-classes 200 performance-schema-max-mutex-instances 3282 -performance-schema-max-rwlock-classes 30 +performance-schema-max-rwlock-classes 40 performance-schema-max-rwlock-instances 1724 performance-schema-max-socket-classes 10 performance-schema-max-socket-instances 179 -- cgit v1.2.1 From fcf87600a2d7ae03f7bda16c2f16cdec980d2a56 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 13 Aug 2013 13:35:36 +0200 Subject: MDEV-4865 Change related to --log option/variable was merged partially Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk (WL#5185 Remove deprecated 5.1 features) --- mysql-test/r/mysqld--help.result | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'mysql-test/r/mysqld--help.result') diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 610157502b9..f221f61be02 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -149,10 +149,6 @@ The following options may be given as the first argument: --div-precision-increment=# Precision of the result of '/' operator will be increased on that value - --engine-condition-pushdown - Push supported query conditions to the storage engine. - Deprecated, use --optimizer-switch instead. - (Defaults to on; use --skip-engine-condition-pushdown to disable.) --event-scheduler[=name] Enable the event scheduler. Possible values are ON, OFF, and DISABLED (keep the event scheduler completely @@ -324,14 +320,6 @@ The following options may be given as the first argument: slave, filesort, filesort_on_disk, full_join, full_scan, query_cache, query_cache_miss, tmp_table, tmp_table_on_disk - --log-slow-queries[=name] - Enable logging of slow queries (longer than - --long-query-time) to log file or table. Optional - argument is a file name for the slow log. If not given, - 'log-basename'-slow.log will be used. Use - --log-output=TABLE if you want to have the log in the - table mysql.slow_log. Deprecated option, use - --slow-query-log/--slow-query-log-file instead. --log-slow-rate-limit=# Write to slow log every #th slow query. Set to 1 to log everything. Increase it to reduce the size of the slow or @@ -477,8 +465,6 @@ The following options may be given as the first argument: Enable old-style user limits (before 5.0.3, user resources were counted per each user+host vs. per account). - --one-thread (Deprecated): Only use one thread (for debugging under - Linux). Use thread-handling=no-threads instead. --open-files-limit=# If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this @@ -857,10 +843,6 @@ The following options may be given as the first argument: --skip-show-database Don't allow 'SHOW DATABASE' commands --skip-slave-start If set, slave is not autostarted. - --skip-thread-priority - Don't give threads different priorities. This option is - deprecated because it has no effect; the implied behavior - is already the default. --slave-compressed-protocol Use compression on master/slave protocol --slave-exec-mode=name @@ -1050,7 +1032,6 @@ delayed-insert-limit 100 delayed-insert-timeout 300 delayed-queue-size 1000 div-precision-increment 4 -engine-condition-pushdown FALSE event-scheduler OFF expensive-subquery-limit 100 expire-logs-days 0 -- cgit v1.2.1 From b7f9c894236c38cb40b5ca70e36d23497fcc01be Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 14 Aug 2013 12:48:50 +0400 Subject: MDEV-4702 - Reduce usage of LOCK_open Following variables do not require LOCK_open protection anymore: - table_def_cache (renamed to tdc_hash) is protected by rw-lock LOCK_tdc_hash; - table_def_shutdown_in_progress doesn't need LOCK_open protection; - last_table_id use atomics; - TABLE_SHARE::ref_count (renamed to TABLE_SHARE::tdc.ref_count) is protected by TABLE_SHARE::tdc.LOCK_table_share; - TABLE_SHARE::next, ::prev (renamed to tdc.next and tdc.prev), oldest_unused_share, end_of_unused_share are protected by LOCK_unused_shares; - TABLE_SHARE::m_flush_tickets (renamed to tdc.m_flush_tickets) is protected by TABLE_SHARE::tdc.LOCK_table_share; - refresh_version (renamed to tdc_version) use atomics. --- mysql-test/r/mysqld--help.result | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mysql-test/r/mysqld--help.result') diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index f221f61be02..aa8bb67d58c 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -927,6 +927,9 @@ The following options may be given as the first argument: The number of cached table definitions --table-open-cache=# The number of cached open tables + --table-open-cache-instances=# + MySQL 5.6 compatible option. Not used or needed in + MariaDB --tc-heuristic-recover=name Decision to use in heuristic recover process. Possible values are COMMIT or ROLLBACK. @@ -1258,6 +1261,7 @@ sysdate-is-now FALSE table-cache 400 table-definition-cache 400 table-open-cache 400 +table-open-cache-instances 1 tc-heuristic-recover COMMIT thread-cache-size 0 thread-pool-idle-timeout 60 -- cgit v1.2.1