diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/1st.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/bug58669.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/connect.result | 15 | ||||
| -rw-r--r-- | mysql-test/r/log_tables.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/log_tables_upgrade.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysql_upgrade.result | 35 | ||||
| -rw-r--r-- | mysql-test/r/mysql_upgrade_ssl.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 28 | ||||
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 107 | ||||
| -rw-r--r-- | mysql-test/r/status.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/status_user.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix40123.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix50030.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix50117.result | 5 |
15 files changed, 222 insertions, 5 deletions
diff --git a/mysql-test/r/1st.result b/mysql-test/r/1st.result index 792d9eaf2f1..f8e4754f861 100644 --- a/mysql-test/r/1st.result +++ b/mysql-test/r/1st.result @@ -17,12 +17,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone diff --git a/mysql-test/r/bug58669.result b/mysql-test/r/bug58669.result index 03032e27e94..cf4eeeb02a1 100644 --- a/mysql-test/r/bug58669.result +++ b/mysql-test/r/bug58669.result @@ -11,6 +11,7 @@ user1@localhost SHOW VARIABLES LIKE "%read_only%"; Variable_name Value read_only ON +tx_read_only OFF INSERT INTO db1.t1 VALUES (1); ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement DROP DATABASE db1; diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index 09eaf9855b0..2150df99030 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -11,12 +11,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone @@ -45,12 +50,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone @@ -87,12 +97,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 62775f3db4d..c25bd6727df 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -363,6 +363,7 @@ Tables_in_mysql (%log%) general_log general_log_new ndb_binlog_index +slave_relay_log_info slow_log slow_log_new drop table slow_log_new, general_log_new; diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result index 5ed59eecc31..9a123d73e45 100644 --- a/mysql-test/r/log_tables_upgrade.result +++ b/mysql-test/r/log_tables_upgrade.result @@ -28,6 +28,8 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK @@ -35,6 +37,9 @@ mysql.procs_priv OK mysql.proxies_priv OK mysql.renamed_general_log OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index 247c2b80d62..b526ce6e0dd 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -16,12 +16,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -53,12 +58,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -90,12 +100,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -130,12 +145,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -173,12 +193,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -219,12 +244,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -268,12 +298,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/mysql-test/r/mysql_upgrade_ssl.result index a08e7c115cc..683a4aa8c98 100644 --- a/mysql-test/r/mysql_upgrade_ssl.result +++ b/mysql-test/r/mysql_upgrade_ssl.result @@ -18,12 +18,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index ab707ceef80..10d09b2a8a7 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -12,12 +12,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -36,12 +41,21 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats +note : Table does not support optimize, doing recreate + analyze instead +status : OK +mysql.innodb_table_stats +note : Table does not support optimize, doing recreate + analyze instead +status : OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -58,12 +72,17 @@ mysql.help_keyword OK mysql.help_relation OK mysql.help_topic OK mysql.host OK +mysql.innodb_index_stats OK +mysql.innodb_table_stats OK mysql.ndb_binlog_index OK mysql.plugin OK mysql.proc OK mysql.procs_priv OK mysql.proxies_priv OK mysql.servers OK +mysql.slave_master_info OK +mysql.slave_relay_log_info OK +mysql.slave_worker_info OK mysql.tables_priv OK mysql.time_zone OK mysql.time_zone_leap_second OK @@ -80,12 +99,21 @@ mysql.help_keyword Table is already up to date mysql.help_relation Table is already up to date mysql.help_topic Table is already up to date mysql.host Table is already up to date +mysql.innodb_index_stats +note : Table does not support optimize, doing recreate + analyze instead +status : OK +mysql.innodb_table_stats +note : Table does not support optimize, doing recreate + analyze instead +status : OK mysql.ndb_binlog_index Table is already up to date mysql.plugin Table is already up to date mysql.proc Table is already up to date mysql.procs_priv Table is already up to date mysql.proxies_priv Table is already up to date mysql.servers Table is already up to date +mysql.slave_master_info Table is already up to date +mysql.slave_relay_log_info Table is already up to date +mysql.slave_worker_info Table is already up to date mysql.tables_priv Table is already up to date mysql.time_zone Table is already up to date mysql.time_zone_leap_second Table is already up to date diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index ad55bfa3003..2b34c4da8af 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -256,8 +256,6 @@ The following options may be given as the first argument: --lock-wait-timeout=# Timeout in seconds to wait for a lock before returning an error. - -l, --log[=name] Log connections and queries to file (deprecated option, - use --general-log/--general-log-file instead). --log-basename=name Basename for all log files and the .pid file. This sets all log file names at once (in 'datadir') and is normally the only option you need for specifying log files. Sets @@ -499,10 +497,66 @@ The following options may be given as the first argument: val is one of {on, off, default} --performance-schema Enable the performance schema. + --performance-schema-accounts-size=# + Maximum number of instrumented user@host accounts. + --performance-schema-consumer-events-stages-current + Default startup value for the events_stages_current + consumer. + --performance-schema-consumer-events-stages-history + Default startup value for the events_stages_history + consumer. + --performance-schema-consumer-events-stages-history-long + Default startup value for the events_stages_history_long + consumer. + --performance-schema-consumer-events-statements-current + Default startup value for the events_statements_current + consumer. + (Defaults to on; use --skip-performance-schema-consumer-events-statements-current to disable.) + --performance-schema-consumer-events-statements-history + Default startup value for the events_statements_history + consumer. + --performance-schema-consumer-events-statements-history-long + Default startup value for the + events_statements_history_long consumer. + --performance-schema-consumer-events-waits-current + Default startup value for the events_waits_current + consumer. + --performance-schema-consumer-events-waits-history + Default startup value for the events_waits_history + consumer. + --performance-schema-consumer-events-waits-history-long + Default startup value for the events_waits_history_long + consumer. + --performance-schema-consumer-global-instrumentation + Default startup value for the global_instrumentation + consumer. + (Defaults to on; use --skip-performance-schema-consumer-global-instrumentation to disable.) + --performance-schema-consumer-statements-digest + Default startup value for the statements_digest consumer. + (Defaults to on; use --skip-performance-schema-consumer-statements-digest to disable.) + --performance-schema-consumer-thread-instrumentation + Default startup value for the thread_instrumentation + consumer. + (Defaults to on; use --skip-performance-schema-consumer-thread-instrumentation to disable.) + --performance-schema-digests-size=# + Size of the statement digest. + --performance-schema-events-stages-history-long-size=# + Number of rows in EVENTS_STAGES_HISTORY_LONG. + --performance-schema-events-stages-history-size=# + Number of rows per thread in EVENTS_STAGES_HISTORY. + --performance-schema-events-statements-history-long-size=# + Number of rows in EVENTS_STATEMENTS_HISTORY_LONG. + --performance-schema-events-statements-history-size=# + Number of rows per thread in EVENTS_STATEMENTS_HISTORY. --performance-schema-events-waits-history-long-size=# Number of rows in EVENTS_WAITS_HISTORY_LONG. --performance-schema-events-waits-history-size=# Number of rows per thread in EVENTS_WAITS_HISTORY. + --performance-schema-hosts-size=# + Maximum number of instrumented hosts. + --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=# @@ -521,6 +575,14 @@ The following options may be given as the first argument: Maximum number of rwlock instruments. --performance-schema-max-rwlock-instances=# Maximum number of instrumented RWLOCK objects. + --performance-schema-max-socket-classes=# + Maximum number of socket instruments. + --performance-schema-max-socket-instances=# + Maximum number of opened instrumented sockets. + --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. --performance-schema-max-table-instances=# @@ -529,6 +591,12 @@ The following options may be given as the first argument: Maximum number of thread instruments. --performance-schema-max-thread-instances=# Maximum number of instrumented threads. + --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. --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 @@ -829,6 +897,9 @@ The following options may be given as the first argument: --transaction-prealloc-size=# Persistent buffer for transactions to be stored in binary log + --transaction-read-only + Default transaction access mode. True if transactions are + read-only. --updatable-views-with-limit=name YES = Don't issue an error message (warning only) if a VIEW without presence of a key of the underlying table is @@ -996,8 +1067,28 @@ 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-consumer-events-stages-current FALSE +performance-schema-consumer-events-stages-history FALSE +performance-schema-consumer-events-stages-history-long FALSE +performance-schema-consumer-events-statements-current TRUE +performance-schema-consumer-events-statements-history FALSE +performance-schema-consumer-events-statements-history-long FALSE +performance-schema-consumer-events-waits-current FALSE +performance-schema-consumer-events-waits-history FALSE +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-instrument performance-schema-max-cond-classes 80 performance-schema-max-cond-instances 1000 performance-schema-max-file-classes 50 @@ -1007,10 +1098,17 @@ performance-schema-max-mutex-classes 200 performance-schema-max-mutex-instances 1000000 performance-schema-max-rwlock-classes 30 performance-schema-max-rwlock-instances 1000000 -performance-schema-max-table-handles 100000 -performance-schema-max-table-instances 50000 +performance-schema-max-socket-classes 10 +performance-schema-max-socket-instances 1000 +performance-schema-max-stage-classes 150 +performance-schema-max-statement-classes 170 +performance-schema-max-table-handles 10000 +performance-schema-max-table-instances 1000 performance-schema-max-thread-classes 50 performance-schema-max-thread-instances 1000 +performance-schema-setup-actors-size 100 +performance-schema-setup-objects-size 100 +performance-schema-users-size 100 plugin-load (No default value) plugin-maturity unknown port 3306 @@ -1087,6 +1185,7 @@ tmp-table-size 16777216 transaction-alloc-block-size 8192 transaction-isolation REPEATABLE-READ transaction-prealloc-size 4096 +transaction-read-only FALSE updatable-views-with-limit YES userstat FALSE verbose TRUE diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 0da65a5ab51..140db7c5721 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -275,6 +275,7 @@ Variable_name Value Handler_commit 0 Handler_delete 0 Handler_discover 0 +Handler_external_lock 0 Handler_icp_attempts 0 Handler_icp_match 0 Handler_mrr_init 0 @@ -303,7 +304,7 @@ Created_tmp_files 0 Created_tmp_tables 2 Handler_tmp_update 2 Handler_tmp_write 7 -Rows_tmp_read 41 +Rows_tmp_read 42 drop table t1; CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM; insert into t1 values (1),(2),(3),(4),(5); @@ -316,6 +317,7 @@ Variable_name Value Handler_commit 0 Handler_delete 0 Handler_discover 0 +Handler_external_lock 0 Handler_icp_attempts 0 Handler_icp_match 0 Handler_mrr_init 0 diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result index f43e217b8a5..6236e62afb9 100644 --- a/mysql-test/r/status_user.result +++ b/mysql-test/r/status_user.result @@ -100,6 +100,7 @@ Variable_name Value Handler_commit 19 Handler_delete 1 Handler_discover 0 +Handler_external_lock 0 Handler_icp_attempts 0 Handler_icp_match 0 Handler_mrr_init 0 diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index d5409136ed4..4d458e7284c 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -10,12 +10,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone diff --git a/mysql-test/r/system_mysql_db_fix40123.result b/mysql-test/r/system_mysql_db_fix40123.result index d5409136ed4..4d458e7284c 100644 --- a/mysql-test/r/system_mysql_db_fix40123.result +++ b/mysql-test/r/system_mysql_db_fix40123.result @@ -10,12 +10,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/r/system_mysql_db_fix50030.result index d5409136ed4..4d458e7284c 100644 --- a/mysql-test/r/system_mysql_db_fix50030.result +++ b/mysql-test/r/system_mysql_db_fix50030.result @@ -10,12 +10,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/r/system_mysql_db_fix50117.result index d5409136ed4..4d458e7284c 100644 --- a/mysql-test/r/system_mysql_db_fix50117.result +++ b/mysql-test/r/system_mysql_db_fix50117.result @@ -10,12 +10,17 @@ help_keyword help_relation help_topic host +innodb_index_stats +innodb_table_stats ndb_binlog_index plugin proc procs_priv proxies_priv servers +slave_master_info +slave_relay_log_info +slave_worker_info slow_log tables_priv time_zone |