diff options
67 files changed, 982 insertions, 93 deletions
@@ -23,7 +23,7 @@ Features recoded Fetures half done: - Support for TRANSACTION READ ONLY | READ WRITE - CF_XXX states added to init_update_queries() but not otherwise used. -- Merge sql/rpl_mi.cc (To get Sys_ssl_crl ? crlpath) +- Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath) Short time TODO: - Add support for TRANSACTION READ ONLY | READ WRITE in sql_yacc.yy diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp index fb342a10fd5..3a1ade9816c 100644 --- a/extra/yassl/src/handshake.cpp +++ b/extra/yassl/src/handshake.cpp @@ -529,7 +529,7 @@ void ProcessOldClientHello(input_buffer& input, SSL& ssl) ato16(len, randomLen); if (ch.suite_len_ > MAX_SUITE_SZ || sessionLen > ID_LEN || - randomLen > RAN_LEN) { + randomLen > RAN_LEN) { ssl.SetError(bad_input); return; } diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp index cf761d912e6..4d41c4f8442 100644 --- a/extra/yassl/src/socket_wrapper.cpp +++ b/extra/yassl/src/socket_wrapper.cpp @@ -202,8 +202,22 @@ uint Socket::receive(byte* buf, unsigned int sz, int flags) // wait if blocking for input, return false for error bool Socket::wait() { - byte b; - return receive(&b, 1, MSG_PEEK) != static_cast<uint>(-1); + char b; + int recvd = ::recv(socket_, &b, 1, MSG_PEEK); + + if (recvd == -1) { + if (get_lastError() == SOCKET_EWOULDBLOCK || + get_lastError() == SOCKET_EAGAIN) { + wouldBlock_ = true; // would have blocked this time only + nonBlocking_ = true; // socket nonblocking, win32 only way to tell + return 1; + } + } + else if (recvd == 0) + return 0; // Non blocking & no data + + return 1; // Data can be read + } diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test index d120a09eff2..da3a4e52f16 100644 --- a/mysql-test/include/check-testcase.test +++ b/mysql-test/include/check-testcase.test @@ -60,8 +60,8 @@ if ($tmp) --echo Last_SQL_Error --echo Replicate_Ignore_Server_Ids --echo Master_Server_Id # - --echo Master_SSL_Crl - --echo Master_SSL_Crlpath + --echo Master_SSL_Crl # + --echo Master_SSL_Crlpath # } if (!$tmp) { # Note: after WL#5177, fields 13-18 shall not be filtered-out. diff --git a/mysql-test/include/have_innodb_16k.inc b/mysql-test/include/have_innodb_16k.inc new file mode 100644 index 00000000000..f0198ca5ee7 --- /dev/null +++ b/mysql-test/include/have_innodb_16k.inc @@ -0,0 +1,4 @@ +if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE LOWER(variable_name) = 'innodb_page_size' AND variable_value = 16384`) +{ + --skip Test requires InnoDB with 16k Page size. +} diff --git a/mysql-test/lib/My/Test.pm b/mysql-test/lib/My/Test.pm index 4d017b3b42c..36f35163c5e 100644 --- a/mysql-test/lib/My/Test.pm +++ b/mysql-test/lib/My/Test.pm @@ -111,7 +111,8 @@ sub read_test { $serialized =~ s/\\([0-9a-fA-F]{2})/chr(hex($1))/eg; my $test= Storable::thaw($serialized); use Data::Dumper; - die "wrong class (hack attempt?): ".ref($test)."\n".Dumper(\$test, $serialized) + # We get a stack trace here when + die "wrong class (hack attempt?): ".ref($test)."\n".Dumper(\$test, $serialized) . " Stack trace: " unless ref($test) eq 'My::Test'; resfile_from_test($test) if $::opt_resfile; return $test; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index cee25edb44a..c7c10f16816 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3451,6 +3451,8 @@ sub mysql_install_db { mtr_add_arg($args, "--datadir=%s", $install_datadir); mtr_add_arg($args, "--default-storage-engine=myisam"); mtr_add_arg($args, "--skip-$_") for @optional_plugins; + # starting from 10.0 bootstrap scripts require InnoDB + mtr_add_arg($args, "--loose-innodb"); mtr_add_arg($args, "--disable-sync-frm"); mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); mtr_add_arg($args, "--core-file"); @@ -4699,6 +4701,7 @@ sub extract_warning_lines ($$) { qr/Plugin 'ndbcluster' will be forced to shutdown/, qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/, qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/, + qr/InnoDB: Warning: Setting innodb_use_sys_malloc/, qr/InnoDB: Warning: a long semaphore wait:/, qr/Slave: Unknown table 't1' Error_code: 1051/, qr/Slave SQL:.*(Error_code: [[:digit:]]+|Query:.*)/, 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 diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index 4eff12dab7b..30c9b74d9a3 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -150,6 +150,51 @@ def mysql servers Server_name 1 NO char 64 192 NULL NULL NULL utf8 utf8_general def mysql servers Socket 7 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references def mysql servers Username 4 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references def mysql servers Wrapper 8 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references +def mysql slave_master_info Bind 18 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references Displays which interface is employed when connecting to the MySQL server +def mysql slave_master_info Connect_retry 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references The period (in seconds) that the slave will wait before trying to reconnect to the master. +def mysql slave_master_info Enabled_auto_position 24 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references Indicates whether GTIDs will be used to retrieve events from the master. +def mysql slave_master_info Enabled_ssl 10 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references Indicates whether the server supports SSL connections. +def mysql slave_master_info Heartbeat 17 NULL NO float NULL NULL 12 NULL NULL NULL NULL float select,insert,update,references +def mysql slave_master_info Host 5 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The host name of the master. +def mysql slave_master_info Ignored_server_ids 19 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The number of server IDs to be ignored, followed by the actual server IDs +def mysql slave_master_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references +def mysql slave_master_info Master_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the master binary log currently being read from the master. +def mysql slave_master_info Master_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references The master log position of the last read event. +def mysql slave_master_info Number_of_lines 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references Number of lines in the file. +def mysql slave_master_info Port 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references The network port used to connect to the master. +def mysql slave_master_info Retry_count 21 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references Number of reconnect attempts, to the master, before giving up. +def mysql slave_master_info Ssl_ca 11 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The file used for the Certificate Authority (CA) certificate. +def mysql slave_master_info Ssl_capath 12 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The path to the Certificate Authority (CA) certificates. +def mysql slave_master_info Ssl_cert 13 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the SSL certificate file. +def mysql slave_master_info Ssl_cipher 14 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the cipher in use for the SSL connection. +def mysql slave_master_info Ssl_crl 22 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The file used for the Certificate Revocation List (CRL) +def mysql slave_master_info Ssl_crlpath 23 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The path used for Certificate Revocation List (CRL) files +def mysql slave_master_info Ssl_key 15 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the SSL key file. +def mysql slave_master_info Ssl_verify_server_cert 16 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references Whether to verify the server certificate. +def mysql slave_master_info User_name 6 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The user name used to connect to the master. +def mysql slave_master_info User_password 7 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The password used to connect to the master. +def mysql slave_master_info Uuid 20 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The master server uuid. +def mysql slave_relay_log_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references +def mysql slave_relay_log_info Master_log_name 5 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the master binary log file from which the events in the relay log file were read. +def mysql slave_relay_log_info Master_log_pos 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references The master log position of the last executed event. +def mysql slave_relay_log_info Number_of_lines 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references Number of lines in the file or rows in the table. Used to version table definitions. +def mysql slave_relay_log_info Number_of_workers 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references +def mysql slave_relay_log_info Relay_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The name of the current relay log file. +def mysql slave_relay_log_info Relay_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references The relay log position of the last executed event. +def mysql slave_relay_log_info Sql_delay 7 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references The number of seconds that the slave must lag behind the master. +def mysql slave_worker_info Checkpoint_group_bitmap 13 NULL NO blob 65535 65535 NULL NULL NULL NULL NULL blob select,insert,update,references +def mysql slave_worker_info Checkpoint_group_size 12 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references +def mysql slave_worker_info Checkpoint_master_log_name 9 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references +def mysql slave_worker_info Checkpoint_master_log_pos 10 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def mysql slave_worker_info Checkpoint_relay_log_name 7 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references +def mysql slave_worker_info Checkpoint_relay_log_pos 8 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def mysql slave_worker_info Checkpoint_seqno 11 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references +def mysql slave_worker_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references +def mysql slave_worker_info Master_log_name 5 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references +def mysql slave_worker_info Master_log_pos 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def mysql slave_worker_info Relay_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references +def mysql slave_worker_info Relay_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references +def mysql slave_worker_info Worker_id 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references def mysql slow_log db 7 NULL NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) select,insert,update,references def mysql slow_log insert_id 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) select,insert,update,references @@ -274,6 +319,7 @@ ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME NULL bigint NULL NULL NULL datetime NULL NULL +NULL float NULL NULL NULL int NULL NULL NULL smallint NULL NULL NULL time NULL NULL @@ -443,6 +489,51 @@ NULL mysql servers Port int NULL NULL NULL NULL int(4) 3.0000 mysql servers Socket char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql servers Wrapper char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql servers Owner char 64 192 utf8 utf8_general_ci char(64) +NULL mysql slave_master_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_master_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_master_info Host text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info User_name text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info User_password text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Port int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Connect_retry int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Enabled_ssl tinyint NULL NULL NULL NULL tinyint(1) +1.0000 mysql slave_master_info Ssl_ca text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_capath text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_cert text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_cipher text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_key text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Ssl_verify_server_cert tinyint NULL NULL NULL NULL tinyint(1) +NULL mysql slave_master_info Heartbeat float NULL NULL NULL NULL float +1.0000 mysql slave_master_info Bind text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ignored_server_ids text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Uuid text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Retry_count bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_master_info Ssl_crl text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_crlpath text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Enabled_auto_position tinyint NULL NULL NULL NULL tinyint(1) +NULL mysql slave_relay_log_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_relay_log_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_relay_log_info Relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_relay_log_info Relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_relay_log_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_relay_log_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +NULL mysql slave_relay_log_info Sql_delay int NULL NULL NULL NULL int(11) +NULL mysql slave_relay_log_info Number_of_workers int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Worker_id int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_worker_info Relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Checkpoint_relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Checkpoint_relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Checkpoint_master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Checkpoint_master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +NULL mysql slave_worker_info Checkpoint_seqno int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Checkpoint_group_size int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_worker_info Checkpoint_group_bitmap blob 65535 65535 NULL NULL blob NULL mysql slow_log start_time timestamp NULL NULL NULL NULL timestamp(6) 1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext NULL mysql slow_log query_time time NULL NULL NULL NULL time(6) diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result index d99e7f06295..61749784d46 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result @@ -150,6 +150,51 @@ def mysql servers Server_name 1 NO char 64 192 NULL NULL NULL utf8 utf8_general def mysql servers Socket 7 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) def mysql servers Username 4 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) def mysql servers Wrapper 8 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) +def mysql slave_master_info Bind 18 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text Displays which interface is employed when connecting to the MySQL server +def mysql slave_master_info Connect_retry 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned The period (in seconds) that the slave will wait before trying to reconnect to the master. +def mysql slave_master_info Enabled_auto_position 24 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) Indicates whether GTIDs will be used to retrieve events from the master. +def mysql slave_master_info Enabled_ssl 10 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) Indicates whether the server supports SSL connections. +def mysql slave_master_info Heartbeat 17 NULL NO float NULL NULL 12 NULL NULL NULL NULL float +def mysql slave_master_info Host 5 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The host name of the master. +def mysql slave_master_info Ignored_server_ids 19 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The number of server IDs to be ignored, followed by the actual server IDs +def mysql slave_master_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI +def mysql slave_master_info Master_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the master binary log currently being read from the master. +def mysql slave_master_info Master_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned The master log position of the last read event. +def mysql slave_master_info Number_of_lines 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned Number of lines in the file. +def mysql slave_master_info Port 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned The network port used to connect to the master. +def mysql slave_master_info Retry_count 21 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned Number of reconnect attempts, to the master, before giving up. +def mysql slave_master_info Ssl_ca 11 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The file used for the Certificate Authority (CA) certificate. +def mysql slave_master_info Ssl_capath 12 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The path to the Certificate Authority (CA) certificates. +def mysql slave_master_info Ssl_cert 13 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the SSL certificate file. +def mysql slave_master_info Ssl_cipher 14 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the cipher in use for the SSL connection. +def mysql slave_master_info Ssl_crl 22 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The file used for the Certificate Revocation List (CRL) +def mysql slave_master_info Ssl_crlpath 23 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The path used for Certificate Revocation List (CRL) files +def mysql slave_master_info Ssl_key 15 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the SSL key file. +def mysql slave_master_info Ssl_verify_server_cert 16 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) Whether to verify the server certificate. +def mysql slave_master_info User_name 6 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The user name used to connect to the master. +def mysql slave_master_info User_password 7 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The password used to connect to the master. +def mysql slave_master_info Uuid 20 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text The master server uuid. +def mysql slave_relay_log_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI +def mysql slave_relay_log_info Master_log_name 5 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the master binary log file from which the events in the relay log file were read. +def mysql slave_relay_log_info Master_log_pos 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned The master log position of the last executed event. +def mysql slave_relay_log_info Number_of_lines 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned Number of lines in the file or rows in the table. Used to version table definitions. +def mysql slave_relay_log_info Number_of_workers 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned +def mysql slave_relay_log_info Relay_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text The name of the current relay log file. +def mysql slave_relay_log_info Relay_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned The relay log position of the last executed event. +def mysql slave_relay_log_info Sql_delay 7 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) The number of seconds that the slave must lag behind the master. +def mysql slave_worker_info Checkpoint_group_bitmap 13 NULL NO blob 65535 65535 NULL NULL NULL NULL NULL blob +def mysql slave_worker_info Checkpoint_group_size 12 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned +def mysql slave_worker_info Checkpoint_master_log_name 9 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text +def mysql slave_worker_info Checkpoint_master_log_pos 10 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned +def mysql slave_worker_info Checkpoint_relay_log_name 7 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text +def mysql slave_worker_info Checkpoint_relay_log_pos 8 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned +def mysql slave_worker_info Checkpoint_seqno 11 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned +def mysql slave_worker_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI +def mysql slave_worker_info Master_log_name 5 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text +def mysql slave_worker_info Master_log_pos 6 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned +def mysql slave_worker_info Relay_log_name 3 NULL NO text 65535 65535 NULL NULL NULL utf8 utf8_bin text +def mysql slave_worker_info Relay_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned +def mysql slave_worker_info Worker_id 2 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI def mysql slow_log db 7 NULL NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) def mysql slow_log insert_id 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) def mysql slow_log last_insert_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) @@ -274,6 +319,7 @@ ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME NULL bigint NULL NULL NULL datetime NULL NULL +NULL float NULL NULL NULL int NULL NULL NULL smallint NULL NULL NULL time NULL NULL @@ -443,6 +489,51 @@ NULL mysql servers Port int NULL NULL NULL NULL int(4) 3.0000 mysql servers Socket char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql servers Wrapper char 64 192 utf8 utf8_general_ci char(64) 3.0000 mysql servers Owner char 64 192 utf8 utf8_general_ci char(64) +NULL mysql slave_master_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_master_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_master_info Host text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info User_name text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info User_password text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Port int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Connect_retry int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_master_info Enabled_ssl tinyint NULL NULL NULL NULL tinyint(1) +1.0000 mysql slave_master_info Ssl_ca text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_capath text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_cert text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_cipher text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_key text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Ssl_verify_server_cert tinyint NULL NULL NULL NULL tinyint(1) +NULL mysql slave_master_info Heartbeat float NULL NULL NULL NULL float +1.0000 mysql slave_master_info Bind text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ignored_server_ids text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Uuid text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Retry_count bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_master_info Ssl_crl text 65535 65535 utf8 utf8_bin text +1.0000 mysql slave_master_info Ssl_crlpath text 65535 65535 utf8 utf8_bin text +NULL mysql slave_master_info Enabled_auto_position tinyint NULL NULL NULL NULL tinyint(1) +NULL mysql slave_relay_log_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_relay_log_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_relay_log_info Relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_relay_log_info Relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_relay_log_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_relay_log_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +NULL mysql slave_relay_log_info Sql_delay int NULL NULL NULL NULL int(11) +NULL mysql slave_relay_log_info Number_of_workers int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Master_id int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Worker_id int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_worker_info Relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Checkpoint_relay_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Checkpoint_relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +1.0000 mysql slave_worker_info Checkpoint_master_log_name text 65535 65535 utf8 utf8_bin text +NULL mysql slave_worker_info Checkpoint_master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned +NULL mysql slave_worker_info Checkpoint_seqno int NULL NULL NULL NULL int(10) unsigned +NULL mysql slave_worker_info Checkpoint_group_size int NULL NULL NULL NULL int(10) unsigned +1.0000 mysql slave_worker_info Checkpoint_group_bitmap blob 65535 65535 NULL NULL blob NULL mysql slow_log start_time timestamp NULL NULL NULL NULL timestamp(6) 1.0000 mysql slow_log user_host mediumtext 16777215 16777215 utf8 utf8_general_ci mediumtext NULL mysql slow_log query_time time NULL NULL NULL NULL time(6) diff --git a/mysql-test/suite/funcs_1/r/is_engines_innodb.result b/mysql-test/suite/funcs_1/r/is_engines_innodb.result index 6de31d3ad31..5713b417cd1 100644 --- a/mysql-test/suite/funcs_1/r/is_engines_innodb.result +++ b/mysql-test/suite/funcs_1/r/is_engines_innodb.result @@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines WHERE ENGINE = 'InnoDB'; ENGINE InnoDB SUPPORT YES -COMMENT Percona-XtraDB, Supports transactions, row-level locking, and foreign keys +COMMENT Supports transactions, row-level locking, and foreign keys TRANSACTIONS YES XA YES SAVEPOINTS YES diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index afd1fe15fed..ae343df021a 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -96,6 +96,14 @@ def mysql PRIMARY def mysql help_topic help_topic_id def mysql name def mysql help_topic name def mysql PRIMARY def mysql host Host def mysql PRIMARY def mysql host Db +def mysql PRIMARY def mysql innodb_index_stats database_name +def mysql PRIMARY def mysql innodb_index_stats table_name +def mysql PRIMARY def mysql innodb_index_stats index_name +def mysql PRIMARY def mysql innodb_index_stats stat_name +def mysql innodb_index_stats_ibfk_1 def mysql innodb_index_stats database_name +def mysql innodb_index_stats_ibfk_1 def mysql innodb_index_stats table_name +def mysql PRIMARY def mysql innodb_table_stats database_name +def mysql PRIMARY def mysql innodb_table_stats table_name def mysql PRIMARY def mysql ndb_binlog_index epoch def mysql PRIMARY def mysql plugin name def mysql PRIMARY def mysql proc db @@ -111,6 +119,10 @@ def mysql PRIMARY def mysql proxies_priv User def mysql PRIMARY def mysql proxies_priv Proxied_host def mysql PRIMARY def mysql proxies_priv Proxied_user def mysql PRIMARY def mysql servers Server_name +def mysql PRIMARY def mysql slave_master_info Master_id +def mysql PRIMARY def mysql slave_relay_log_info Master_id +def mysql PRIMARY def mysql slave_worker_info Master_id +def mysql PRIMARY def mysql slave_worker_info Worker_id def mysql PRIMARY def mysql tables_priv Host def mysql PRIMARY def mysql tables_priv Db def mysql PRIMARY def mysql tables_priv User diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result index 8543b207728..b9fc71623ef 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics.result +++ b/mysql-test/suite/funcs_1/r/is_statistics.result @@ -124,6 +124,10 @@ def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql PRIMARY def mysql proxies_priv mysql Grantor def mysql servers mysql PRIMARY +def mysql slave_master_info mysql PRIMARY +def mysql slave_relay_log_info mysql PRIMARY +def mysql slave_worker_info mysql PRIMARY +def mysql slave_worker_info mysql PRIMARY def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY def mysql tables_priv mysql PRIMARY diff --git a/mysql-test/suite/funcs_1/r/is_statistics_mysql.result b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result index 4c7d58f96f1..7234f07f64b 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql.result @@ -29,6 +29,12 @@ def mysql help_topic 0 mysql name 1 name A #CARD# NULL NULL BTREE def mysql help_topic 0 mysql PRIMARY 1 help_topic_id A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 3 index_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 4 stat_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE @@ -46,6 +52,10 @@ def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE +def mysql slave_master_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_relay_log_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 2 Worker_id A #CARD# NULL NULL BTREE def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE diff --git a/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result index 9137d70b88c..0de4e584b56 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result @@ -29,6 +29,12 @@ def mysql help_topic 0 mysql name 1 name A #CARD# NULL NULL BTREE def mysql help_topic 0 mysql PRIMARY 1 help_topic_id A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 3 index_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 4 stat_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE @@ -46,6 +52,10 @@ def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE +def mysql slave_master_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_relay_log_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 2 Worker_id A #CARD# NULL NULL BTREE def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE @@ -87,6 +97,12 @@ def mysql help_topic 0 mysql name 1 name A #CARD# NULL NULL BTREE def mysql help_topic 0 mysql PRIMARY 1 help_topic_id A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql host 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 3 index_name A #CARD# NULL NULL BTREE +def mysql innodb_index_stats 0 mysql PRIMARY 4 stat_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 1 database_name A #CARD# NULL NULL BTREE +def mysql innodb_table_stats 0 mysql PRIMARY 2 table_name A #CARD# NULL NULL BTREE def mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A #CARD# NULL NULL BTREE def mysql plugin 0 mysql PRIMARY 1 name A #CARD# NULL NULL BTREE def mysql proc 0 mysql PRIMARY 1 db A #CARD# NULL NULL BTREE @@ -104,6 +120,10 @@ def mysql proxies_priv 0 mysql PRIMARY 2 User A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 3 Proxied_host A #CARD# NULL NULL BTREE def mysql proxies_priv 0 mysql PRIMARY 4 Proxied_user A #CARD# NULL NULL BTREE def mysql servers 0 mysql PRIMARY 1 Server_name A #CARD# NULL NULL BTREE +def mysql slave_master_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_relay_log_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 1 Master_id A #CARD# NULL NULL BTREE +def mysql slave_worker_info 0 mysql PRIMARY 2 Worker_id A #CARD# NULL NULL BTREE def mysql tables_priv 1 mysql Grantor 1 Grantor A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 1 Host A #CARD# NULL NULL BTREE def mysql tables_priv 0 mysql PRIMARY 2 Db A #CARD# NULL NULL BTREE diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index 559a1f1f9f5..65d1aa134db 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -69,12 +69,18 @@ def mysql PRIMARY mysql help_relation def mysql PRIMARY mysql help_topic def mysql name mysql help_topic def mysql PRIMARY mysql host +def mysql PRIMARY mysql innodb_index_stats +def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats +def mysql PRIMARY mysql innodb_table_stats def mysql PRIMARY mysql ndb_binlog_index def mysql PRIMARY mysql plugin def mysql PRIMARY mysql proc def mysql PRIMARY mysql procs_priv def mysql PRIMARY mysql proxies_priv def mysql PRIMARY mysql servers +def mysql PRIMARY mysql slave_master_info +def mysql PRIMARY mysql slave_relay_log_info +def mysql PRIMARY mysql slave_worker_info def mysql PRIMARY mysql tables_priv def mysql PRIMARY mysql time_zone def mysql PRIMARY mysql time_zone_leap_second diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result index bca333b6387..ac366703ee1 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result @@ -19,12 +19,18 @@ def mysql PRIMARY mysql help_relation PRIMARY KEY def mysql name mysql help_topic UNIQUE def mysql PRIMARY mysql help_topic PRIMARY KEY def mysql PRIMARY mysql host PRIMARY KEY +def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats FOREIGN KEY +def mysql PRIMARY mysql innodb_index_stats PRIMARY KEY +def mysql PRIMARY mysql innodb_table_stats PRIMARY KEY def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY def mysql PRIMARY mysql plugin PRIMARY KEY def mysql PRIMARY mysql proc PRIMARY KEY def mysql PRIMARY mysql procs_priv PRIMARY KEY def mysql PRIMARY mysql proxies_priv PRIMARY KEY def mysql PRIMARY mysql servers PRIMARY KEY +def mysql PRIMARY mysql slave_master_info PRIMARY KEY +def mysql PRIMARY mysql slave_relay_log_info PRIMARY KEY +def mysql PRIMARY mysql slave_worker_info PRIMARY KEY def mysql PRIMARY mysql tables_priv PRIMARY KEY def mysql PRIMARY mysql time_zone PRIMARY KEY def mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result index 307357cdd2b..49315af50d4 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result @@ -19,12 +19,18 @@ def mysql PRIMARY mysql help_relation PRIMARY KEY def mysql name mysql help_topic UNIQUE def mysql PRIMARY mysql help_topic PRIMARY KEY def mysql PRIMARY mysql host PRIMARY KEY +def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats FOREIGN KEY +def mysql PRIMARY mysql innodb_index_stats PRIMARY KEY +def mysql PRIMARY mysql innodb_table_stats PRIMARY KEY def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY def mysql PRIMARY mysql plugin PRIMARY KEY def mysql PRIMARY mysql proc PRIMARY KEY def mysql PRIMARY mysql procs_priv PRIMARY KEY def mysql PRIMARY mysql proxies_priv PRIMARY KEY def mysql PRIMARY mysql servers PRIMARY KEY +def mysql PRIMARY mysql slave_master_info PRIMARY KEY +def mysql PRIMARY mysql slave_relay_log_info PRIMARY KEY +def mysql PRIMARY mysql slave_worker_info PRIMARY KEY def mysql PRIMARY mysql tables_priv PRIMARY KEY def mysql PRIMARY mysql time_zone PRIMARY KEY def mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY @@ -49,12 +55,18 @@ def mysql PRIMARY mysql help_relation PRIMARY KEY def mysql name mysql help_topic UNIQUE def mysql PRIMARY mysql help_topic PRIMARY KEY def mysql PRIMARY mysql host PRIMARY KEY +def mysql innodb_index_stats_ibfk_1 mysql innodb_index_stats FOREIGN KEY +def mysql PRIMARY mysql innodb_index_stats PRIMARY KEY +def mysql PRIMARY mysql innodb_table_stats PRIMARY KEY def mysql PRIMARY mysql ndb_binlog_index PRIMARY KEY def mysql PRIMARY mysql plugin PRIMARY KEY def mysql PRIMARY mysql proc PRIMARY KEY def mysql PRIMARY mysql procs_priv PRIMARY KEY def mysql PRIMARY mysql proxies_priv PRIMARY KEY def mysql PRIMARY mysql servers PRIMARY KEY +def mysql PRIMARY mysql slave_master_info PRIMARY KEY +def mysql PRIMARY mysql slave_relay_log_info PRIMARY KEY +def mysql PRIMARY mysql slave_worker_info PRIMARY KEY def mysql PRIMARY mysql tables_priv PRIMARY KEY def mysql PRIMARY mysql time_zone PRIMARY KEY def mysql PRIMARY mysql time_zone_leap_second PRIMARY KEY diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result index 1b317fa5bba..f94c5e8fbdc 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result @@ -244,6 +244,52 @@ user_comment Host privileges; Merged with database privileges Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME innodb_index_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME innodb_table_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME ndb_binlog_index TABLE_TYPE BASE TABLE ENGINE MYISAM_OR_MARIA @@ -382,6 +428,75 @@ user_comment MySQL Foreign Servers table Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME slave_master_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Master Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_relay_log_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Relay Log Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_worker_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Worker Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME slow_log TABLE_TYPE BASE TABLE ENGINE CSV diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result index e5afebd0de9..f96b4aa0e4b 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result @@ -244,6 +244,52 @@ user_comment Host privileges; Merged with database privileges Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME innodb_index_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME innodb_table_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME ndb_binlog_index TABLE_TYPE BASE TABLE ENGINE MYISAM_OR_MARIA @@ -382,6 +428,75 @@ user_comment MySQL Foreign Servers table Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME slave_master_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Master Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_relay_log_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Relay Log Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_worker_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Worker Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME slow_log TABLE_TYPE BASE TABLE ENGINE CSV @@ -812,6 +927,52 @@ user_comment Host privileges; Merged with database privileges Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME innodb_index_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME innodb_table_stats +TABLE_TYPE BASE TABLE +ENGINE InnoDB +VERSION 10 +ROW_FORMAT Compact +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_bin +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME ndb_binlog_index TABLE_TYPE BASE TABLE ENGINE MYISAM_OR_MARIA @@ -950,6 +1111,75 @@ user_comment MySQL Foreign Servers table Separator ----------------------------------------------------- TABLE_CATALOG def TABLE_SCHEMA mysql +TABLE_NAME slave_master_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Master Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_relay_log_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Relay Log Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql +TABLE_NAME slave_worker_info +TABLE_TYPE BASE TABLE +ENGINE MYISAM_OR_MARIA +VERSION 10 +ROW_FORMAT DYNAMIC_OR_PAGE +TABLE_ROWS #TBLR# +AVG_ROW_LENGTH #ARL# +DATA_LENGTH #DL# +MAX_DATA_LENGTH #MDL# +INDEX_LENGTH #IL# +DATA_FREE #DF# +AUTO_INCREMENT NULL +CREATE_TIME #CRT# +UPDATE_TIME #UT# +CHECK_TIME #CT# +TABLE_COLLATION utf8_general_ci +CHECKSUM NULL +CREATE_OPTIONS #CO# +TABLE_COMMENT #TC# +user_comment Worker Information +Separator ----------------------------------------------------- +TABLE_CATALOG def +TABLE_SCHEMA mysql TABLE_NAME slow_log TABLE_TYPE BASE TABLE ENGINE CSV diff --git a/mysql-test/suite/funcs_1/t/is_basics_mixed.test b/mysql-test/suite/funcs_1/t/is_basics_mixed.test index ee4e009ab0d..21efafb5afa 100644 --- a/mysql-test/suite/funcs_1/t/is_basics_mixed.test +++ b/mysql-test/suite/funcs_1/t/is_basics_mixed.test @@ -23,7 +23,7 @@ # - Can't create/write to file # '.../var/master-data/information_schema/tables.frm~ --source include/not_embedded.inc - +--source include/have_innodb.inc --source suite/funcs_1/datadict/datadict.pre # $engine_type must point to storage engine which is all time available. diff --git a/mysql-test/suite/funcs_1/t/is_key_column_usage.test b/mysql-test/suite/funcs_1/t/is_key_column_usage.test index a6bd8fc3989..8a911231dc0 100644 --- a/mysql-test/suite/funcs_1/t/is_key_column_usage.test +++ b/mysql-test/suite/funcs_1/t/is_key_column_usage.test @@ -16,4 +16,5 @@ # --source include/not_embedded.inc +--source include/have_innodb.inc --source suite/funcs_1/datadict/is_key_column_usage.inc diff --git a/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test b/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test index c2c99c34e3e..7a823821a6b 100644 --- a/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test +++ b/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test @@ -13,6 +13,7 @@ # 2008-06-06 mleich Create this this variant for the embedded server. # +--source include/have_innodb.inc if (`SELECT VERSION() NOT LIKE '%embedded%'`) { --skip Test requires: embedded server diff --git a/mysql-test/suite/funcs_1/t/is_statistics_mysql.test b/mysql-test/suite/funcs_1/t/is_statistics_mysql.test index a1250b67b8c..2ddada4ffe7 100644 --- a/mysql-test/suite/funcs_1/t/is_statistics_mysql.test +++ b/mysql-test/suite/funcs_1/t/is_statistics_mysql.test @@ -13,6 +13,7 @@ # --source include/not_embedded.inc +--source include/have_innodb.inc let $database = mysql; let $my_where = WHERE table_schema = 'mysql'; --source suite/funcs_1/datadict/statistics.inc diff --git a/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test b/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test index 6fedbe4d3a8..6c3159901a2 100644 --- a/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test +++ b/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test @@ -14,6 +14,7 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`) { --skip Test requires: embedded server } +--source include/have_innodb.inc let $database = mysql; let $my_where = WHERE table_schema = 'mysql'; --source suite/funcs_1/datadict/statistics.inc diff --git a/mysql-test/suite/funcs_1/t/is_table_constraints.test b/mysql-test/suite/funcs_1/t/is_table_constraints.test index a64b3bfaa6e..79766fc1dff 100644 --- a/mysql-test/suite/funcs_1/t/is_table_constraints.test +++ b/mysql-test/suite/funcs_1/t/is_table_constraints.test @@ -19,6 +19,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/have_innodb.inc let $engine_type = MyISAM; diff --git a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test index a909676943e..5a9cbd352d8 100644 --- a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test +++ b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test @@ -13,5 +13,6 @@ # --source include/not_embedded.inc +--source include/have_innodb.inc let $table_schema = mysql; --source suite/funcs_1/datadict/table_constraints.inc diff --git a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test index 8994be31be8..dbe00798378 100644 --- a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test +++ b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test @@ -10,6 +10,7 @@ # 2008-06-06 mleich Create this this variant for the embedded server. # +--source include/have_innodb.inc if (`SELECT VERSION() NOT LIKE '%embedded%'`) { --skip Test requires: embedded server diff --git a/mysql-test/suite/funcs_1/t/is_tables_mysql.test b/mysql-test/suite/funcs_1/t/is_tables_mysql.test index 838704051f8..22dc5d6e74e 100644 --- a/mysql-test/suite/funcs_1/t/is_tables_mysql.test +++ b/mysql-test/suite/funcs_1/t/is_tables_mysql.test @@ -13,5 +13,6 @@ # --source include/not_embedded.inc +--source include/have_innodb.inc let $my_where = WHERE table_schema = 'mysql'; --source suite/funcs_1/datadict/tables1.inc diff --git a/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test b/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test index 3f4ca17cdd3..60251370aaa 100644 --- a/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test +++ b/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test @@ -10,6 +10,7 @@ # 2008-06-06 mleich Create this this variant for the embedded server. # +--source include/have_innodb.inc if (`SELECT VERSION() NOT LIKE '%embedded%'`) { --skip Test requires: embedded server diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb/r/innodb-zip.result index b84f04c8cf0..910e2e6f42a 100644 --- a/mysql-test/suite/innodb/r/innodb-zip.result +++ b/mysql-test/suite/innodb/r/innodb-zip.result @@ -66,6 +66,8 @@ Warning 140 InnoDB: ignoring KEY_BLOCK_SIZE=9. SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t0 Compact 16384 0 test t00 Compact 16384 0 test t1 Compact 16384 0 @@ -88,16 +90,22 @@ alter table t1 row_format=dynamic; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Dynamic 16384 0 alter table t1 row_format=compact; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Compact 16384 0 alter table t1 row_format=redundant; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Redundant 16384 0 drop table t1; create table t1(a int not null, b text, index(b(10))) engine=innodb @@ -118,6 +126,8 @@ a left(b,40) SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Compressed 2048 1024 test t2 Compact 16384 0 drop table t1,t2; @@ -210,6 +220,8 @@ create table t11(id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Compact 16384 0 test t10 Compact 16384 0 test t11 Redundant 16384 0 @@ -249,6 +261,8 @@ key_block_size = 8 row_format = default; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t1 Compressed 8192 0 test t5 Compressed 8192 0 drop table t1, t5; @@ -279,6 +293,8 @@ Error 1005 Can't create table 'test.t2' (errno: 140 "Wrong create options") SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 set global innodb_file_per_table = off; create table t1 (id int primary key) engine = innodb key_block_size = 1; ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options") @@ -327,6 +343,8 @@ create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t8 Compact 16384 0 test t9 Redundant 16384 0 drop table t8, t9; @@ -379,6 +397,8 @@ create table t9 (id int primary key) engine = innodb row_format = redundant; SELECT table_schema, table_name, row_format, data_length, index_length FROM information_schema.tables WHERE engine='innodb'; table_schema table_name row_format data_length index_length +mysql innodb_index_stats Compact 16384 0 +mysql innodb_table_stats Compact 16384 0 test t8 Compact 16384 0 test t9 Redundant 16384 0 drop table t8, t9; diff --git a/mysql-test/suite/innodb/r/innodb_bug11766634.result b/mysql-test/suite/innodb/r/innodb_bug11766634.result deleted file mode 100644 index 7594d512638..00000000000 --- a/mysql-test/suite/innodb/r/innodb_bug11766634.result +++ /dev/null @@ -1,5 +0,0 @@ -create table t1 (f1 char(255)) engine innodb; -drop table t1; -create table t1 (f1 char(255)) engine innodb; -1 -drop table t1; diff --git a/mysql-test/suite/innodb/r/innodb_bug57904.result b/mysql-test/suite/innodb/r/innodb_bug57904.result index d265adc385f..bbcd71325d1 100644 --- a/mysql-test/suite/innodb/r/innodb_bug57904.result +++ b/mysql-test/suite/innodb/r/innodb_bug57904.result @@ -15,6 +15,17 @@ REFERENCES customer(id) ) ENGINE=INNODB; SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS; CONSTRAINT_CATALOG def +CONSTRAINT_SCHEMA mysql +CONSTRAINT_NAME innodb_index_stats_ibfk_1 +UNIQUE_CONSTRAINT_CATALOG def +UNIQUE_CONSTRAINT_SCHEMA mysql +UNIQUE_CONSTRAINT_NAME PRIMARY +MATCH_OPTION NONE +UPDATE_RULE RESTRICT +DELETE_RULE RESTRICT +TABLE_NAME innodb_index_stats +REFERENCED_TABLE_NAME innodb_table_stats +CONSTRAINT_CATALOG def CONSTRAINT_SCHEMA test CONSTRAINT_NAME product_order_ibfk_1 UNIQUE_CONSTRAINT_CATALOG def diff --git a/mysql-test/suite/innodb/t/innodb_bug11766634.test b/mysql-test/suite/innodb/t/innodb_bug11766634.test deleted file mode 100644 index f360c4b1ce1..00000000000 --- a/mysql-test/suite/innodb/t/innodb_bug11766634.test +++ /dev/null @@ -1,59 +0,0 @@ -# Bug 11766634 59783: InnoDB data grows unexpectedly when inserting, -# truncating, inserting the same set of rows. -# -# Scenario: -# create table t1. Insert $recs records. check size of ibdata1. -# drop table t1. create table t1. Insert the same set of $recs -# records. The size of ibdata1 must not increase. -# - --- source include/not_embedded.inc --- source include/have_innodb.inc - -create table t1 (f1 char(255)) engine innodb; -let $MYSQLD_DATADIR=`select @@datadir`; -let IBDATA1=$MYSQLD_DATADIR/ibdata1; - -let $recs = 36262; - ---disable_query_log -let $c = $recs; -start transaction; -while ($c) -{ - insert into t1 values ('Hello World'); - dec $c; -} -commit work; ---enable_query_log - -perl; -my $filesize = -s $ENV{'IBDATA1'}; -my $filename = $ENV{MYSQL_TMP_DIR} . '/innodb_bug11766634.txt'; -open F, '>', $filename or die "open(>$filename): $!"; -print F $filesize; -EOF - -drop table t1; -create table t1 (f1 char(255)) engine innodb; - ---disable_query_log -let $c = $recs; -start transaction; -while ($c) -{ - insert into t1 values ('Hello World'); - dec $c; -} -commit work; ---enable_query_log - -perl; -my $filesize = -s $ENV{'IBDATA1'}; -my $filename = $ENV{MYSQL_TMP_DIR} . '/innodb_bug11766634.txt'; -$_=do $filename; -print $_ == $filesize, "\n"; -EOF - -drop table t1; - diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test index 19c7fad484d..70fec8cb959 100644 --- a/mysql-test/suite/innodb/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb/t/innodb_bug60049.test @@ -1,15 +1,23 @@ ---source include/have_innodb.inc # Bug #60049 Verify that purge leaves no garbage in unique secondary indexes # This test requires a fresh server start-up and a slow shutdown. # This was a suspected bug (not a bug). -- source include/not_embedded.inc +-- source include/have_innodb.inc +-- source include/have_innodb_16k.inc # # This test will not work if we don't do full shutdown of innodb # set @@global.innodb_fast_shutdown=0; +-- disable_query_log +let $create1 = query_get_value(SHOW CREATE TABLE mysql.innodb_table_stats, Create Table, 1); +let $create2 = query_get_value(SHOW CREATE TABLE mysql.innodb_index_stats, Create Table, 1); +DROP TABLE mysql.innodb_index_stats; +DROP TABLE mysql.innodb_table_stats; +-- enable_query_log + CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; @@ -42,3 +50,8 @@ EOF -- exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -- enable_reconnect -- source include/wait_until_connected_again.inc + +-- disable_query_log +USE mysql; +eval $create1; +eval $create2; diff --git a/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt b/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt index 075af88054f..f61926581b7 100644 --- a/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt +++ b/mysql-test/suite/percona/percona_flush_contiguous_neighbors-master.opt @@ -1 +1 @@ ---innodb_flush_neighbor_pages=cont +--loose-innodb_flush_neighbor_pages=cont diff --git a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test index fedad86ea91..a47526d5716 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test +++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test @@ -6,6 +6,7 @@ # statements are binlogged or not. ############################################################################# --source include/master-slave.inc +--source include/have_innodb.inc # Only run test if "mysql_upgrade" is found --source include/have_mysql_upgrade.inc diff --git a/mysql-test/t/default_storage_engine.test b/mysql-test/t/default_storage_engine.test index 4ecfc3b8d44..dd6f4728f47 100644 --- a/mysql-test/t/default_storage_engine.test +++ b/mysql-test/t/default_storage_engine.test @@ -3,11 +3,11 @@ if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'in --skip Requires built-in InnoDB. } -let $cmd=`select replace("$MYSQLD_BOOTSTRAP_CMD", " --default-storage-engine=myisam", "")`; +let $cmd=`select replace("$MYSQLD_BOOTSTRAP_CMD --skip-innodb", " --default-storage-engine=myisam", "")`; # # Now it *must* fail, because if InnoDB is compiled in, it is used as a default -# storage engine. but $MYSQLD_BOOTSTRAP_CMD includes --skip-innodb +# storage engine. but $cmd includes --skip-innodb # error 1; exec $cmd; diff --git a/mysql-test/t/log_state-master.opt b/mysql-test/t/log_state-master.opt index 445c6223d47..3e8a84b8d7a 100644 --- a/mysql-test/t/log_state-master.opt +++ b/mysql-test/t/log_state-master.opt @@ -1 +1 @@ ---log-output=TABLE,FILE --log --general-log=0 --log-slow-queries --slow-query-log=0 +--log-output=TABLE,FILE --general-log=0 --log-slow-queries --slow-query-log=0 diff --git a/mysql-test/t/log_state_bug33693-master.opt b/mysql-test/t/log_state_bug33693-master.opt index 9f4ae1a0c8f..fa3cf2ef78f 100644 --- a/mysql-test/t/log_state_bug33693-master.opt +++ b/mysql-test/t/log_state_bug33693-master.opt @@ -1 +1 @@ ---pid-file=$MYSQLTEST_VARDIR/run/mysqld.1.pid --log= +--pid-file=$MYSQLTEST_VARDIR/run/mysqld.1.pid --general-log --general-log-file= diff --git a/mysql-test/t/log_tables_upgrade.test b/mysql-test/t/log_tables_upgrade.test index a638a27c9d1..feb2d8c4aa9 100644 --- a/mysql-test/t/log_tables_upgrade.test +++ b/mysql-test/t/log_tables_upgrade.test @@ -1,5 +1,6 @@ --source include/not_embedded.inc --source include/have_csv.inc +--source include/have_innodb.inc # Only run test if "mysql_upgrade" is found --require r/have_mysql_upgrade.result diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt index 69debb24dae..5b347aa0416 100644 --- a/mysql-test/t/mysql_client_test-master.opt +++ b/mysql-test/t/mysql_client_test-master.opt @@ -1,2 +1,3 @@ ---log=$MYSQLTEST_VARDIR/log/master.log +--general-log +--general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE diff --git a/mysql-test/t/mysql_client_test_nonblock-master.opt b/mysql-test/t/mysql_client_test_nonblock-master.opt index 4c683f7f0a2..034d5340a23 100644 --- a/mysql-test/t/mysql_client_test_nonblock-master.opt +++ b/mysql-test/t/mysql_client_test_nonblock-master.opt @@ -1 +1 @@ ---log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE +--general-log --general-log-file=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE,TABLE diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 78d439d5d52..4c5d00ed9b7 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -1,5 +1,6 @@ -- source include/mysql_upgrade_preparation.inc -- source include/have_working_dns.inc +-- source include/have_innodb.inc # # Basic test that we can run mysql_upgrde and that it finds the diff --git a/mysql-test/t/mysql_upgrade_ssl.test b/mysql-test/t/mysql_upgrade_ssl.test index 8ed818186b2..9049bf73821 100644 --- a/mysql-test/t/mysql_upgrade_ssl.test +++ b/mysql-test/t/mysql_upgrade_ssl.test @@ -2,6 +2,7 @@ -- source include/have_ssl_communication.inc -- source include/mysql_upgrade_preparation.inc +-- source include/have_innodb.inc --echo # --echo # Bug#55672 mysql_upgrade dies with internal error diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index eaa2e7a8840..d28e614cc03 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -13,6 +13,9 @@ let collation=utf8_unicode_ci; # Save the initial number of concurrent sessions --source include/count_sessions.inc +# There are tables in 'mysql' database of type innodb +--source include/have_innodb.inc + disable_query_log; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); enable_query_log; diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test index e1de1cc8153..6b121762354 100644 --- a/mysql-test/t/plugin_auth.test +++ b/mysql-test/t/plugin_auth.test @@ -1,6 +1,7 @@ --source include/have_plugin_auth.inc --source include/not_embedded.inc --source include/mysql_upgrade_preparation.inc +--source include/have_innodb.inc query_vertical SELECT PLUGIN_STATUS, PLUGIN_TYPE, PLUGIN_DESCRIPTION FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='test_plugin_server'; diff --git a/mysql-test/t/subselect_mat_cost-master.opt b/mysql-test/t/subselect_mat_cost-master.opt index dc7ac6cc205..f188fad94fe 100644 --- a/mysql-test/t/subselect_mat_cost-master.opt +++ b/mysql-test/t/subselect_mat_cost-master.opt @@ -1 +1 @@ ---log-output=TABLE,FILE --log --log-slow-queries --slow-query-log=1 +--log-output=TABLE,FILE --general-log --log-slow-queries --slow-query-log=1 diff --git a/mysql-test/t/system_mysql_db_fix40123.test b/mysql-test/t/system_mysql_db_fix40123.test index 5c82f0022b8..80f6486d90e 100644 --- a/mysql-test/t/system_mysql_db_fix40123.test +++ b/mysql-test/t/system_mysql_db_fix40123.test @@ -1,5 +1,6 @@ # Embedded server doesn't support external clients --source include/not_embedded.inc +--source include/have_innodb.inc # Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set # to the location of mysql_fix_privilege_tables.sql @@ -61,7 +62,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, # Run the mysql_fix_privilege_tables.sql using "mysql --force" ---exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES +--exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/system_mysql_db_fix40123.log 2>&1 -- enable_query_log -- enable_result_log @@ -72,7 +73,7 @@ CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, -- disable_query_log # Drop all tables created by this test -DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv; +DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv, slave_master_info, slave_relay_log_info, innodb_index_stats, innodb_table_stats, slave_worker_info; -- enable_query_log diff --git a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/t/system_mysql_db_fix50030.test index e8cfe6a6cf3..be3a54fdfec 100644 --- a/mysql-test/t/system_mysql_db_fix50030.test +++ b/mysql-test/t/system_mysql_db_fix50030.test @@ -1,5 +1,6 @@ # Embedded server doesn't support external clients --source include/not_embedded.inc +--source include/have_innodb.inc # Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set # to the location of mysql_fix_privilege_tables.sql @@ -67,7 +68,7 @@ CREATE TABLE servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) N INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root'); # Run the mysql_fix_privilege_tables.sql using "mysql --force" ---exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES +--exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/system_mysql_db_fix50030.log 2>&1 -- enable_query_log -- enable_result_log @@ -78,7 +79,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r -- disable_query_log # Drop all tables created by this test -DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv; +DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv, slave_master_info, slave_relay_log_info, innodb_index_stats, innodb_table_stats, slave_worker_info; -- enable_query_log diff --git a/mysql-test/t/system_mysql_db_fix50117.test b/mysql-test/t/system_mysql_db_fix50117.test index 69ad68faaa8..92313b2f084 100644 --- a/mysql-test/t/system_mysql_db_fix50117.test +++ b/mysql-test/t/system_mysql_db_fix50117.test @@ -1,5 +1,6 @@ # Embedded server doesn't support external clients --source include/not_embedded.inc +--source include/have_innodb.inc # Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set # to the location of mysql_fix_privilege_tables.sql @@ -86,7 +87,7 @@ CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_b CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM; # Run the mysql_fix_privilege_tables.sql using "mysql --force" ---exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES +--exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/system_mysql_db_fix50117.log 2>&1 -- enable_query_log -- enable_result_log @@ -97,7 +98,7 @@ CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, -- disable_query_log # Drop all tables created by this test -DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv; +DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv, slave_master_info, slave_relay_log_info, innodb_index_stats, innodb_table_stats, slave_worker_info; -- enable_query_log diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index a01ce84dfa5..7079b5a6b19 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -100,6 +100,46 @@ CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_b CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM; +CREATE TABLE IF NOT EXISTS slave_relay_log_info (Master_id INTEGER UNSIGNED NOT NULL, Number_of_lines INTEGER UNSIGNED NOT NULL COMMENT 'Number of lines in the file or rows in the table. Used to version table definitions.', Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the current relay log file.', Relay_log_pos BIGINT UNSIGNED NOT NULL COMMENT 'The relay log position of the last executed event.', Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the master binary log file from which the events in the relay log file were read.', Master_log_pos BIGINT UNSIGNED NOT NULL COMMENT 'The master log position of the last executed event.', Sql_delay INTEGER NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.', Number_of_workers INTEGER UNSIGNED NOT NULL, PRIMARY KEY(Master_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Relay Log Information'; + +CREATE TABLE IF NOT EXISTS slave_master_info (Master_id INTEGER UNSIGNED NOT NULL, Number_of_lines INTEGER UNSIGNED NOT NULL COMMENT 'Number of lines in the file.', Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the master binary log currently being read from the master.', Master_log_pos BIGINT UNSIGNED NOT NULL COMMENT 'The master log position of the last read event.', Host TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The host name of the master.', User_name TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The user name used to connect to the master.', User_password TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The password used to connect to the master.', Port INTEGER UNSIGNED NOT NULL COMMENT 'The network port used to connect to the master.', Connect_retry INTEGER UNSIGNED NOT NULL COMMENT 'The period (in seconds) that the slave will wait before trying to reconnect to the master.', Enabled_ssl BOOLEAN NOT NULL COMMENT 'Indicates whether the server supports SSL connections.', Ssl_ca TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Authority (CA) certificate.', Ssl_capath TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path to the Certificate Authority (CA) certificates.', Ssl_cert TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the SSL certificate file.', Ssl_cipher TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the cipher in use for the SSL connection.', Ssl_key TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the SSL key file.', Ssl_verify_server_cert BOOLEAN NOT NULL COMMENT 'Whether to verify the server certificate.', Heartbeat FLOAT NOT NULL COMMENT '', Bind TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Displays which interface is employed when connecting to the MySQL server', Ignored_server_ids TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs', Uuid TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.', Retry_count BIGINT UNSIGNED NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.', Ssl_crl TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)', Ssl_crlpath TEXT CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files', Enabled_auto_position BOOLEAN NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.', PRIMARY KEY(Master_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Master Information'; + +CREATE TABLE IF NOT EXISTS slave_worker_info (Master_id INTEGER UNSIGNED NOT NULL, Worker_id INTEGER UNSIGNED NOT NULL, Relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Relay_log_pos BIGINT UNSIGNED NOT NULL, Master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_relay_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_relay_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_master_log_name TEXT CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, Checkpoint_master_log_pos BIGINT UNSIGNED NOT NULL, Checkpoint_seqno INT UNSIGNED NOT NULL, Checkpoint_group_size INTEGER UNSIGNED NOT NULL, Checkpoint_group_bitmap BLOB NOT NULL, PRIMARY KEY(Master_id, Worker_id)) ENGINE=MYISAM DEFAULT CHARSET=utf8 COMMENT 'Worker Information'; + +SET @sql_mode_orig=@@SESSION.sql_mode; +SET SESSION sql_mode='NO_ENGINE_SUBSTITUTION'; + +CREATE TABLE IF NOT EXISTS innodb_table_stats ( + database_name VARCHAR(64) NOT NULL, + table_name VARCHAR(64) NOT NULL, + last_update TIMESTAMP NOT NULL, + n_rows BIGINT UNSIGNED NOT NULL, + clustered_index_size BIGINT UNSIGNED NOT NULL, + sum_of_other_index_sizes BIGINT UNSIGNED NOT NULL, + PRIMARY KEY (database_name, table_name) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + +CREATE TABLE IF NOT EXISTS innodb_index_stats ( + database_name VARCHAR(64) NOT NULL, + table_name VARCHAR(64) NOT NULL, + index_name VARCHAR(64) NOT NULL, + last_update TIMESTAMP NOT NULL, + /* there are at least: + stat_name='size' + stat_name='n_leaf_pages' + stat_name='n_diff_pfx%' */ + stat_name VARCHAR(64) NOT NULL, + stat_value BIGINT UNSIGNED NOT NULL, + sample_size BIGINT UNSIGNED, + stat_description VARCHAR(1024) NOT NULL, + PRIMARY KEY (database_name, table_name, index_name, stat_name), + FOREIGN KEY (database_name, table_name) + REFERENCES innodb_table_stats (database_name, table_name) +) ENGINE=INNODB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + +SET SESSION sql_mode=@sql_mode_orig; + + -- -- PERFORMANCE SCHEMA INSTALLATION -- Note that this script is also reused by mysql_upgrade, diff --git a/sql/slave.cc b/sql/slave.cc index ec57f01c6ed..b0a21317adf 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2062,6 +2062,10 @@ bool show_master_info(THD* thd, Master_info* mi) FN_REFLEN)); field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong), MYSQL_TYPE_LONG)); + field_list.push_back(new Item_empty_string("Master_SSL_Crl", + sizeof(mi->ssl_crl))); + field_list.push_back(new Item_empty_string("Master_SSL_Crlpath", + sizeof(mi->ssl_crlpath))); if (protocol->send_result_set_metadata(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) @@ -2210,6 +2214,10 @@ bool show_master_info(THD* thd, Master_info* mi) } // Master_Server_id protocol->store((uint32) mi->master_id); + // Master_Ssl_Crl + protocol->store(mi->ssl_ca, &my_charset_bin); + // Master_Ssl_Crlpath + protocol->store(mi->ssl_capath, &my_charset_bin); mysql_mutex_unlock(&mi->rli.err_lock); mysql_mutex_unlock(&mi->err_lock); @@ -4661,6 +4669,10 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi, mi->ssl_cipher[0]?mi->ssl_cipher:0); mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &mi->ssl_verify_server_cert); + mysql_options(mysql, MYSQL_OPT_SSL_CRLPATH, + mi->ssl_crlpath[0] ? mi->ssl_crlpath : 0); + mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + &mi->ssl_verify_server_cert); } #endif |