diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-06 10:36:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-06 10:36:10 -0400 |
| commit | 780c40ef0e1d200fd6874a9e8e65705e685d76c0 (patch) | |
| tree | 0a29ad51f0192f865d79de65b566da61add4b536 | |
| parent | d8ad96eac0df9241ba200634717227a7153086e1 (diff) | |
| download | mariadb-git-10.2-mdev7635.tar.gz | |
MDEV-7635: Part 110.2-mdev7635
innodb_buffer_pool_dump_at_shutdown = ON
innodb_buffer_pool_dump_pct = 25
innodb_buffer_pool_load_at_startup = ON
innodb_checksum_algorithm = CRC32
innodb_file_format = Barracuda
innodb_file_format_max = Barracuda
innodb_large_prefix = ON
innodb_log_compressed_pages = ON
innodb_log_file_size = 128M
innodb_purge_threads = 4
innodb_stats_traditional = OFF
innodb_strict_mode = ON
binlog_annotate_row_events = ON
binlog_format = MIXED
group_concat_max_len = 1M
histogram_size = 255
long-query-time = 2
lower_case_table_names = 2
max_allowed_packet = 16M
replicate_annotate_row_events = ON
slave_net_timeout = 60
sync_binlog = 1
use_stat_tables = complementary
aria_recover = FORCE,BACKUP
myisam_recover_options = FORCE,BACKUP
84 files changed, 397 insertions, 227 deletions
diff --git a/mysql-test/include/explain_non_select.inc b/mysql-test/include/explain_non_select.inc index 57b96994d20..0dcea4695e9 100644 --- a/mysql-test/include/explain_non_select.inc +++ b/mysql-test/include/explain_non_select.inc @@ -4,6 +4,7 @@ -- disable_query_log -- disable_result_log # SET GLOBAL innodb_stats_persistent=0; +SET SESSION use_stat_tables=never; -- enable_result_log -- enable_query_log @@ -829,5 +830,6 @@ DROP TABLE t1, t2; -- disable_query_log -- disable_result_log # SET GLOBAL innodb_stats_persistent=default; +SET SESSION use_stat_tables=default; -- enable_result_log -- enable_query_log diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 0801890c384..89d2efc042f 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -181,6 +181,7 @@ t1 0 a 2 b A 300 NULL NULL YES BTREE t1 1 b 1 b A 100 NULL NULL YES BTREE analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result index af5d1b800aa..2a6023fa93e 100644 --- a/mysql-test/r/explain_json.result +++ b/mysql-test/r/explain_json.result @@ -1026,6 +1026,7 @@ create index idx_t1_1 on t1 (a1,a2,b,c); create index idx_t1_2 on t1 (a1,a2,b); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date explain select count(distinct a1,a2,b) from t1 where (a2 >= 'b') and (b = 'a'); id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result index 4c4ad4da051..5773fbed2e3 100644 --- a/mysql-test/r/func_gconcat.result +++ b/mysql-test/r/func_gconcat.result @@ -1164,7 +1164,7 @@ t2 CREATE TABLE `t2` ( `GROUP_CONCAT(UPPER(f1) ORDER BY f2)` mediumtext DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; -SET group_concat_max_len= DEFAULT; +SET group_concat_max_len= 1024; SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1; LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) 1024 diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index 43c51b838e2..658b2efb02d 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -748,6 +748,7 @@ Table Op Msg_type Msg_text test.t1 check status OK analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK drop table t1; CREATE TABLE t1 ( diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index f27ae67adff..fad05dc6901 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1330,6 +1330,7 @@ INSERT INTO t1 SELECT a + 64,b FROM t1; INSERT INTO t1 SELECT a + 128,b FROM t1 limit 16; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK EXPLAIN SELECT a FROM t1 WHERE a < 2; id select_type table type possible_keys key key_len ref rows Extra @@ -2683,6 +2684,7 @@ create table t2 (c int, col1 int, key(c)); insert into t2 select t1.a, 100000 from t1; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date explain select diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result index cf867dd1e18..301df536e63 100644 --- a/mysql-test/r/group_min_max.result +++ b/mysql-test/r/group_min_max.result @@ -40,6 +40,7 @@ create index idx_t1_1 on t1 (a1,a2,b,c); create index idx_t1_2 on t1 (a1,a2,b); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date drop table if exists t2; create table t2 ( @@ -68,6 +69,7 @@ create index idx_t2_1 on t2 (a1,a2,b,c); create index idx_t2_2 on t2 (a1,a2,b); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date drop table if exists t3; create table t3 ( @@ -130,6 +132,7 @@ create index idx_t3_1 on t3 (a1,a2,b,c); create index idx_t3_2 on t3 (a1,a2,b); analyze table t3; Table Op Msg_type Msg_text +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date explain select a1, min(a2) from t1 group by a1; id select_type table type possible_keys key key_len ref rows Extra @@ -2460,7 +2463,7 @@ FLUSH STATUS; INSERT INTO t3 SELECT a,MAX(b) FROM t1 GROUP BY a; SHOW STATUS LIKE 'handler_read__e%'; Variable_name Value -Handler_read_key 8 +Handler_read_key 13 Handler_read_next 0 DELETE FROM t3; FLUSH STATUS; @@ -2711,6 +2714,7 @@ CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL, KEY (b)); INSERT INTO t1 VALUES(1,1),(2,1); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SELECT 1 AS c, b FROM t1 WHERE b IN (1,2) GROUP BY c, b; c b @@ -3601,6 +3605,7 @@ CREATE TABLE t (a INT, b INT, KEY(a,b)); INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5); ANALYZE TABLE t; Table Op Msg_type Msg_text +test.t analyze status Engine-independent statistics collected test.t analyze status OK SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a; a SUM(DISTINCT a) MIN(b) diff --git a/mysql-test/r/group_min_max_innodb.result b/mysql-test/r/group_min_max_innodb.result index 77c74fbc041..e639fa85f77 100644 --- a/mysql-test/r/group_min_max_innodb.result +++ b/mysql-test/r/group_min_max_innodb.result @@ -41,6 +41,7 @@ create index idx12672_1 on t4 (a1,a2,b,c); create index idx12672_2 on t4 (a1,a2,b); analyze table t4; Table Op Msg_type Msg_text +test.t4 analyze status Engine-independent statistics collected test.t4 analyze status OK select distinct a1 from t4 where pk_col not in (1,2,3,4); a1 diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index 5202c79f3c7..4d334de5485 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -106,6 +106,7 @@ insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b) select key1a, key1b, key2a, key2b, key3a, key3b from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1; count(*) diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result index a857e2a21ff..c6b0edeaaf7 100644 --- a/mysql-test/r/index_merge_myisam.result +++ b/mysql-test/r/index_merge_myisam.result @@ -18,6 +18,7 @@ alter table t0 add key8 int not null, add index i8(key8); update t0 set key2=key1,key3=key1,key4=key1,key5=key1,key6=key1,key7=key1,key8=1024-key1; analyze table t0; Table Op Msg_type Msg_text +test.t0 analyze status Engine-independent statistics collected test.t0 analyze status OK explain select * from t0 where key1 < 3 or key1 > 1020; id select_type table type possible_keys key key_len ref rows Extra @@ -941,6 +942,7 @@ insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b) select key1a, key1b, key2a, key2b, key3a, key3b from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1; count(*) diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result index cae402a9f12..2e0d83b41df 100644 --- a/mysql-test/r/innodb_ext_key.result +++ b/mysql-test/r/innodb_ext_key.result @@ -844,7 +844,9 @@ alter table t3 add primary key (pk1, pk2); alter table t3 add key (col1, col2); analyze table t1,t3; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status OK set optimizer_switch='extended_keys=off'; explain diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index 0313666d2a5..38b85e8840e 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -457,6 +457,7 @@ connection default; LOCK TABLE t1 WRITE; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date connection con2; LOCK TABLE t2 WRITE; diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 46997361bbe..1a0a878005f 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -11,7 +11,7 @@ SET @saved_general_log = @@GLOBAL.general_log; SET @saved_slow_query_log = @@GLOBAL.slow_query_log; SELECT @saved_long_query_time, @saved_log_output, @saved_general_log, @saved_slow_query_log; @saved_long_query_time @saved_log_output @saved_general_log @saved_slow_query_log -10 FILE,TABLE 1 1 +2 FILE,TABLE 1 1 truncate table general_log; select * from general_log; event_time user_host thread_id server_id command_type argument diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 93b16896380..b56c3e8638e 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -2118,6 +2118,7 @@ CREATE TABLE t1(a INT, KEY(a)); INSERT INTO t1 VALUES(0),(1),(2),(3),(4); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK CREATE TABLE m1(a INT, KEY(a)) ENGINE=MERGE UNION=(t1); SELECT CARDINALITY FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_SCHEMA='test' AND TABLE_NAME='m1'; diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result index cfb193ccb1a..9b249118993 100644 --- a/mysql-test/r/mix2_myisam.result +++ b/mysql-test/r/mix2_myisam.result @@ -210,6 +210,7 @@ create index skr on t1 (a); insert into t1 values (3,""), (4,"testing"); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 424adf318bb..7ef4cfa99d8 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -673,6 +673,7 @@ insert into t1 values (0),(1),(2),(3),(4); insert into t1 select NULL from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -693,6 +694,7 @@ insert into t1 values (11); delete from t1 where a=11; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -713,6 +715,7 @@ insert into t1 values (11); delete from t1 where a=11; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -740,6 +743,7 @@ insert into t1 values ('bce','def1', 'yuu', NULL); insert into t1 values ('bce','def2', NULL, 'quux'); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -750,6 +754,7 @@ t1 1 a 4 d A 4 NULL NULL YES BTREE delete from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -1785,6 +1790,7 @@ create table t1 (a int, key(a)); insert into t1 values (1),(2),(3),(4),(NULL),(NULL),(NULL),(NULL); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index ad57cc6fe5e..cb1399d9c93 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -33,6 +33,7 @@ The following options may be given as the first argument: --binlog-annotate-row-events Tells the master to annotate RBR events with the statement that caused these events + (Defaults to on; use --skip-binlog-annotate-row-events to disable.) --binlog-cache-size=# The size of the transactional cache for updates to transactional engines for the binary log. If you often @@ -805,6 +806,7 @@ The following options may be given as the first argument: Tells the slave to write annotate rows events received from the master to its own binary log. Ignored if log_slave_updates is not set + (Defaults to on; use --skip-replicate-annotate-row-events to disable.) --replicate-do-db=name Tells the slave thread to restrict replication to the specified database. To specify more than one database, @@ -1161,13 +1163,13 @@ automatic-sp-privileges TRUE back-log 80 big-tables FALSE bind-address (No default value) -binlog-annotate-row-events FALSE +binlog-annotate-row-events TRUE binlog-cache-size 32768 binlog-checksum CRC32 binlog-commit-wait-count 0 binlog-commit-wait-usec 100000 binlog-direct-non-transactional-updates FALSE -binlog-format STATEMENT +binlog-format MIXED binlog-optimize-thread-scheduling TRUE binlog-row-event-max-size 1024 binlog-row-image FULL @@ -1218,12 +1220,12 @@ ft-stopword-file (No default value) gdb FALSE general-log FALSE getopt-prefix-matching TRUE -group-concat-max-len 1024 +group-concat-max-len 1048576 gtid-domain-id 0 gtid-ignore-duplicates FALSE gtid-strict-mode FALSE help TRUE -histogram-size 0 +histogram-size 255 histogram-type SINGLE_PREC_HB host-cache-size 279 ignore-builtin-innodb FALSE @@ -1265,13 +1267,13 @@ log-slow-slave-statements FALSE log-slow-verbosity log-tc tc.log log-warnings 1 -long-query-time 10 +long-query-time 2 low-priority-updates FALSE lower-case-table-names 1 master-info-file master.info master-retry-count 86400 master-verify-checksum FALSE -max-allowed-packet 4194304 +max-allowed-packet 16777216 max-binlog-cache-size 18446744073709547520 max-binlog-size 1073741824 max-binlog-stmt-cache-size 18446744073709547520 @@ -1283,7 +1285,7 @@ max-error-count 64 max-heap-table-size 16777216 max-join-size 18446744073709551615 max-length-for-sort-data 1024 -max-long-data-size 4194304 +max-long-data-size 16777216 max-prepared-stmt-count 16382 max-relay-log-size 1073741824 max-seeks-for-key 18446744073709551615 @@ -1303,7 +1305,7 @@ myisam-block-size 1024 myisam-data-pointer-size 6 myisam-max-sort-file-size 9223372036853727232 myisam-mmap-size 18446744073709551615 -myisam-recover-options DEFAULT +myisam-recover-options BACKUP,FORCE myisam-repair-threads 1 myisam-sort-buffer-size 134216704 myisam-stats-method NULLS_UNEQUAL @@ -1393,7 +1395,7 @@ relay-log-info-file relay-log.info relay-log-purge TRUE relay-log-recovery FALSE relay-log-space-limit 0 -replicate-annotate-row-events FALSE +replicate-annotate-row-events TRUE replicate-events-marked-for-skip REPLICATE replicate-same-server-id FALSE report-host (No default value) @@ -1421,7 +1423,7 @@ slave-ddl-exec-mode IDEMPOTENT slave-domain-parallel-threads 0 slave-exec-mode STRICT slave-max-allowed-packet 1073741824 -slave-net-timeout 3600 +slave-net-timeout 60 slave-parallel-max-queued 131072 slave-parallel-mode conservative slave-parallel-threads 0 @@ -1439,7 +1441,7 @@ stack-trace TRUE stored-program-cache 256 strict-password-validation TRUE symbolic-links FALSE -sync-binlog 0 +sync-binlog 1 sync-frm FALSE sync-master-info 10000 sync-relay-log 10000 @@ -1463,7 +1465,7 @@ transaction-isolation REPEATABLE-READ transaction-prealloc-size 4096 transaction-read-only FALSE updatable-views-with-limit YES -use-stat-tables NEVER +use-stat-tables COMPLEMENTARY userstat FALSE verbose TRUE wait-timeout 28800 diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index e80851329a4..1430bb1b462 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -399,8 +399,11 @@ INSERT INTO t3 SELECT * FROM t4; INSERT INTO t3 VALUES (2), (3); ANALYZE table t1, t2, t3; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status OK SELECT COUNT(*) FROM t3; COUNT(*) diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 99b0e287975..92acd9e44e0 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -286,6 +286,7 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par t1 1 a 1 a A NULL NULL NULL YES BTREE analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK show indexes from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -1020,6 +1021,7 @@ PARTITION BY LIST (a) (PARTITION x1 VALUES IN (10), PARTITION x2 VALUES IN (20)); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK drop table t1; create table t1 @@ -1815,6 +1817,7 @@ Table Op Msg_type Msg_text test.t1 check status OK ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze note The storage engine for the table doesn't support analyze drop table t1; drop procedure if exists mysqltest_1; @@ -2051,6 +2054,7 @@ ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'EXTENDED' at line 1 ALTER TABLE t1 ANALYZE PARTITION p1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK ALTER TABLE t1 CHECK PARTITION p1; Table Op Msg_type Msg_text diff --git a/mysql-test/r/partition_binlog.result b/mysql-test/r/partition_binlog.result index 21eca8f1c00..3e6100b51d8 100644 --- a/mysql-test/r/partition_binlog.result +++ b/mysql-test/r/partition_binlog.result @@ -27,6 +27,7 @@ Table Op Msg_type Msg_text test.t1 repair error Error in list of partitions to test.t1 ALTER TABLE t1 ANALYZE PARTITION p0; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK ALTER TABLE t1 CHECK PARTITION p0; Table Op Msg_type Msg_text diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result index c9568f7b07f..c6e55ce713f 100644 --- a/mysql-test/r/partition_innodb.result +++ b/mysql-test/r/partition_innodb.result @@ -25,6 +25,7 @@ INSERT INTO t1 VALUES (0, 'Mod Zero'), (1, 'One'), (2, 'Two'), (3, 'Three'), INSERT INTO t1 SELECT a + 30, b FROM t1 WHERE a >= 0; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK EXPLAIN SELECT b FROM t1 WHERE b between 'L' and 'N' AND a > -100; id select_type table type possible_keys key key_len ref rows Extra @@ -760,8 +761,22 @@ SUBPARTITION BY KEY(f6) SUBPARTITIONS 4 ( PARTITION p0 VALUES IN (1,3,9,null), PARTITION p1 VALUES IN (2,4,0) ); -Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes +ERROR HY000: Index column size too large. The maximum column size is 767 bytes. +CREATE TABLE t2 ( +f2 VARCHAR(5) CHARACTER SET latin1, +f3 VARCHAR(5) CHARACTER SET utf8, +f4 INT, +f5 VARCHAR(512) CHARACTER SET utf8, +f6 VARCHAR(256) CHARACTER SET utf8, +key (f2), +key (f3), +key (f5) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC +PARTITION BY LIST COLUMNS (f4) +SUBPARTITION BY KEY(f6) SUBPARTITIONS 4 ( +PARTITION p0 VALUES IN (1,3,9,null), +PARTITION p1 VALUES IN (2,4,0) +); INSERT INTO t2 VALUES ('k','s',3,'b','j'),('a','b',NULL,'v','j'),('c','m',9,'t',NULL), ('b','l',9,'b',NULL),('i','y',3,'o','w'),('c','m',NULL,'a','m'), diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result index a665224f59d..e4a472b3e89 100644 --- a/mysql-test/r/ps_ddl.result +++ b/mysql-test/r/ps_ddl.result @@ -1399,6 +1399,7 @@ SUCCESS prepare stmt from "analyze table t1"; execute stmt; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK drop table t1; create table t1 (a1 int, a2 int); @@ -1406,14 +1407,17 @@ insert into t1 values (1, 10), (2, 20), (3, 30); # t1 has changed, and it's not a problem execute stmt; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK alter table t1 add column b varchar(50) default NULL; execute stmt; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK alter table t1 drop column b; execute stmt; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK call p_verify_reprepare_count(0); SUCCESS diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index 268bd184c58..7938f2fcfef 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -417,7 +417,9 @@ count(*) 1026 analyze table t1,t2; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date explain select * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; id select_type table type possible_keys key key_len ref rows Extra @@ -1909,6 +1911,7 @@ alter table t1 add key2 int not null, add index i2(key2); update t1 set key2=key1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK create table t2 (a int); insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8); @@ -2107,6 +2110,7 @@ insert into t2 select * from t2; insert into t2 values (0, 0, 0, 0), (1, 1, 1, 1); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK select a, b from t2 where (a, b) in ((0, 0), (1, 1)); a b diff --git a/mysql-test/r/range_innodb.result b/mysql-test/r/range_innodb.result index 794e6c7b3cc..2ede6351957 100644 --- a/mysql-test/r/range_innodb.result +++ b/mysql-test/r/range_innodb.result @@ -30,6 +30,7 @@ repeat('0123456789', 10) from t1; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK # The following must not use "Range checked for each record": explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250; diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result index 5c6930f4323..531f8ba1074 100644 --- a/mysql-test/r/range_mrr_icp.result +++ b/mysql-test/r/range_mrr_icp.result @@ -419,7 +419,9 @@ count(*) 1026 analyze table t1,t2; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date explain select * from t1, t2 where t1.uid=t2.uid AND t1.uid > 0; id select_type table type possible_keys key key_len ref rows Extra @@ -1911,6 +1913,7 @@ alter table t1 add key2 int not null, add index i2(key2); update t1 set key2=key1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK create table t2 (a int); insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8); @@ -2109,6 +2112,7 @@ insert into t2 select * from t2; insert into t2 values (0, 0, 0, 0), (1, 1, 1, 1); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK select a, b from t2 where (a, b) in ((0, 0), (1, 1)); a b diff --git a/mysql-test/r/range_vs_index_merge.result b/mysql-test/r/range_vs_index_merge.result index 1b12a9f5512..09b005e34e5 100644 --- a/mysql-test/r/range_vs_index_merge.result +++ b/mysql-test/r/range_vs_index_merge.result @@ -1427,6 +1427,7 @@ insert into t1(account_id, login, home_state, work_state) select 1, 'pw', 'ak', 'ak' from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1 where account_id = 1; count(*) @@ -1488,6 +1489,7 @@ insert into t1 (c2, c3, c4, c5, cp) select c2, c3, c4, c5, cp from t1 where cp = 4; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK explain select * from t1 where (c2=1 and c3=1) or (c4=2 and c5=1); @@ -1540,6 +1542,7 @@ insert into t1 (c2,c3,c4) select c2,c3,3 from t1 where c2 != 'a'; insert into t1 (c2,c3,c4) select c2,c3,4 from t1 where c2 != 'a'; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1 where (c2='e' OR c3='q'); count(*) @@ -1579,6 +1582,7 @@ update t1 set c1=lpad(id+1000, 12, ' '), c2=lpad(id+10000, 15, ' '); alter table t1 add unique index (c1), add unique index (c2), add index (c3); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date explain select * from t1 where (c1=' 100000' or c2=' 2000000'); diff --git a/mysql-test/r/range_vs_index_merge_innodb.result b/mysql-test/r/range_vs_index_merge_innodb.result index 8428936d25f..f8d83b7ef33 100644 --- a/mysql-test/r/range_vs_index_merge_innodb.result +++ b/mysql-test/r/range_vs_index_merge_innodb.result @@ -1428,6 +1428,7 @@ insert into t1(account_id, login, home_state, work_state) select 1, 'pw', 'ak', 'ak' from t1; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1 where account_id = 1; count(*) @@ -1489,6 +1490,7 @@ insert into t1 (c2, c3, c4, c5, cp) select c2, c3, c4, c5, cp from t1 where cp = 4; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK explain select * from t1 where (c2=1 and c3=1) or (c4=2 and c5=1); @@ -1541,6 +1543,7 @@ insert into t1 (c2,c3,c4) select c2,c3,3 from t1 where c2 != 'a'; insert into t1 (c2,c3,c4) select c2,c3,4 from t1 where c2 != 'a'; analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK select count(*) from t1 where (c2='e' OR c3='q'); count(*) @@ -1580,6 +1583,7 @@ update t1 set c1=lpad(id+1000, 12, ' '), c2=lpad(id+10000, 15, ' '); alter table t1 add unique index (c1), add unique index (c2), add index (c3); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK explain select * from t1 where (c1=' 100000' or c2=' 2000000'); diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 8e516c93a14..8b830ccc473 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -3453,6 +3453,7 @@ create table t2 (a int, b int, c int, e int, primary key(a,b,c)); insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK select 'In next EXPLAIN, B.rows must be exactly 10:' Z; Z @@ -3746,12 +3747,14 @@ CREATE TABLE t1 (a INT, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDAT INSERT INTO t1 VALUES (30,"2006-01-03 23:00:00"), (31,"2006-01-03 23:00:00"); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK CREATE TABLE t2 (a INT, dt1 DATETIME, dt2 DATETIME, PRIMARY KEY (a)); INSERT INTO t2 VALUES (30, "2006-01-01 00:00:00", "2999-12-31 00:00:00"); INSERT INTO t2 SELECT a+1,dt1,dt2 FROM t2; ANALYZE TABLE t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30 diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result index 99400a09ac7..0aee1edb40a 100644 --- a/mysql-test/r/select_jcl6.result +++ b/mysql-test/r/select_jcl6.result @@ -3464,6 +3464,7 @@ create table t2 (a int, b int, c int, e int, primary key(a,b,c)); insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK select 'In next EXPLAIN, B.rows must be exactly 10:' Z; Z @@ -3757,12 +3758,14 @@ CREATE TABLE t1 (a INT, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDAT INSERT INTO t1 VALUES (30,"2006-01-03 23:00:00"), (31,"2006-01-03 23:00:00"); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK CREATE TABLE t2 (a INT, dt1 DATETIME, dt2 DATETIME, PRIMARY KEY (a)); INSERT INTO t2 VALUES (30, "2006-01-01 00:00:00", "2999-12-31 00:00:00"); INSERT INTO t2 SELECT a+1,dt1,dt2 FROM t2; ANALYZE TABLE t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30 diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result index 8e516c93a14..8b830ccc473 100644 --- a/mysql-test/r/select_pkeycache.result +++ b/mysql-test/r/select_pkeycache.result @@ -3453,6 +3453,7 @@ create table t2 (a int, b int, c int, e int, primary key(a,b,c)); insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK select 'In next EXPLAIN, B.rows must be exactly 10:' Z; Z @@ -3746,12 +3747,14 @@ CREATE TABLE t1 (a INT, ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDAT INSERT INTO t1 VALUES (30,"2006-01-03 23:00:00"), (31,"2006-01-03 23:00:00"); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK CREATE TABLE t2 (a INT, dt1 DATETIME, dt2 DATETIME, PRIMARY KEY (a)); INSERT INTO t2 VALUES (30, "2006-01-01 00:00:00", "2999-12-31 00:00:00"); INSERT INTO t2 SELECT a+1,dt1,dt2 FROM t2; ANALYZE TABLE t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK EXPLAIN SELECT * FROM t1 LEFT JOIN t2 ON (t1.a=t2.a) WHERE t1.a=30 diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result index 60364b8c4ec..25fa09121fd 100644 --- a/mysql-test/r/select_safe.result +++ b/mysql-test/r/select_safe.result @@ -62,6 +62,7 @@ a b 5 a analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"); insert into t1 values (null,"b"),(null,"b"),(null,"c"),(null,"c"),(null,"d"),(null,"d"),(null,"e"),(null,"e"),(null,"a"),(null,"e"); diff --git a/mysql-test/r/set_statement.result b/mysql-test/r/set_statement.result index adb50afde99..3da4d1fe5ae 100644 --- a/mysql-test/r/set_statement.result +++ b/mysql-test/r/set_statement.result @@ -1040,7 +1040,7 @@ set @save_slow_query_log= @@slow_query_log; set @save_log_output= @@log_output; set statement long_query_time=default for select @@long_query_time; @@long_query_time -10.000000 +2.000000 set statement log_slow_filter=default for select @@log_slow_filter; @@log_slow_filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index ce23fe1693e..c8029943d1c 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -2291,9 +2291,11 @@ create procedure bug3843() analyze table t1| call bug3843()| Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK call bug3843()| Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date select 1+2| 1+2 @@ -4338,8 +4340,11 @@ test.t3 optimize status OK test.v1 optimize Error 'test.v1' is not BASE TABLE test.v1 optimize status Operation failed Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date test.v1 analyze Error 'test.v1' is not BASE TABLE test.v1 analyze status Operation failed @@ -4357,8 +4362,11 @@ test.t3 optimize status OK test.v1 optimize Error 'test.v1' is not BASE TABLE test.v1 optimize status Operation failed Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date test.v1 analyze Error 'test.v1' is not BASE TABLE test.v1 analyze status Operation failed @@ -4376,8 +4384,11 @@ test.t3 optimize status OK test.v1 optimize Error 'test.v1' is not BASE TABLE test.v1 optimize status Operation failed Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date test.v1 analyze Error 'test.v1' is not BASE TABLE test.v1 analyze status Operation failed diff --git a/mysql-test/r/stat_tables.result b/mysql-test/r/stat_tables.result index fcced761283..345f4b6fbae 100644 --- a/mysql-test/r/stat_tables.result +++ b/mysql-test/r/stat_tables.result @@ -6,6 +6,7 @@ select @@session.use_stat_tables; COMPLEMENTARY set @save_use_stat_tables=@@use_stat_tables; set use_stat_tables='preferably'; +set histogram_size=0; DROP DATABASE IF EXISTS dbt3_s001; CREATE DATABASE dbt3_s001; use dbt3_s001; diff --git a/mysql-test/r/stat_tables_disabled.result b/mysql-test/r/stat_tables_disabled.result index f57abc34e0c..fafe413fa70 100644 --- a/mysql-test/r/stat_tables_disabled.result +++ b/mysql-test/r/stat_tables_disabled.result @@ -1,10 +1,10 @@ SET SESSION STORAGE_ENGINE='InnoDB'; select @@global.use_stat_tables; @@global.use_stat_tables -NEVER +COMPLEMENTARY select @@session.use_stat_tables; @@session.use_stat_tables -NEVER +COMPLEMENTARY set @save_use_stat_tables=@@use_stat_tables; set use_stat_tables='preferably'; DROP DATABASE IF EXISTS dbt3_s001; diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 60ec5d7dec3..306221ef24a 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -275,6 +275,7 @@ disconnect con1; connection default; DROP PROCEDURE p1; DROP FUNCTION f1; +SET SESSION use_stat_tables = never; flush status; create table t1 (a int not null auto_increment primary key, g int, b blob); insert into t1 (g,b) values (1,'a'), (2, 'b'), (3, 'b'), (1, 'c'); @@ -335,6 +336,7 @@ Handler_tmp_update 2 Handler_tmp_write 7 Rows_tmp_read 42 drop table t1; +SET SESSION use_stat_tables = default; CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM; insert into t1 values (1),(2),(3),(4),(5); flush status; diff --git a/mysql-test/r/subselect_exists2in.result b/mysql-test/r/subselect_exists2in.result index 1d0732060b7..53030d06d6a 100644 --- a/mysql-test/r/subselect_exists2in.result +++ b/mysql-test/r/subselect_exists2in.result @@ -142,6 +142,7 @@ create index idx_t1_1 on t1 (a1,a2,b,c); create index idx_t1_2 on t1 (a1,a2,b); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date create table t2 ( a1 char(64), a2 char(64) not null, b char(16), c char(16), d char(16), dummy char(64) default ' ' @@ -169,6 +170,7 @@ create index idx_t2_1 on t2 (a1,a2,b,c); create index idx_t2_2 on t2 (a1,a2,b); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date create table t3 ( a1 char(1), a2 char(1), b char(1), c char(4) not null, d char(3), dummy char(1) default ' ' @@ -230,6 +232,7 @@ create index idx_t3_1 on t3 (a1,a2,b,c); create index idx_t3_2 on t3 (a1,a2,b); analyze table t3; Table Op Msg_type Msg_text +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date explain select a1,a2,b,c,min(c), max(c) from t1 where exists ( select * from t2 diff --git a/mysql-test/r/subselect_extra.result b/mysql-test/r/subselect_extra.result index 48b80e02e1a..3e73b058852 100644 --- a/mysql-test/r/subselect_extra.result +++ b/mysql-test/r/subselect_extra.result @@ -132,6 +132,7 @@ create index idx_t1_1 on t1 (a1,a2,b,c); create index idx_t1_2 on t1 (a1,a2,b); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date create table t2 ( a1 char(64), a2 char(64) not null, b char(16), c char(16), d char(16), dummy char(64) default ' ' @@ -159,6 +160,7 @@ create index idx_t2_1 on t2 (a1,a2,b,c); create index idx_t2_2 on t2 (a1,a2,b); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date create table t3 ( a1 char(1), a2 char(1), b char(1), c char(4) not null, d char(3), dummy char(1) default ' ' @@ -220,6 +222,7 @@ create index idx_t3_1 on t3 (a1,a2,b,c); create index idx_t3_2 on t3 (a1,a2,b); analyze table t3; Table Op Msg_type Msg_text +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date explain select a1,a2,b,c,min(c), max(c) from t1 where exists ( select * from t2 @@ -302,6 +305,7 @@ INSERT INTO t1 SELECT a + 64,b FROM t1; INSERT INTO t1 SELECT a + 128,b FROM t1 limit 16; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK EXPLAIN SELECT 1 FROM t1 WHERE a IN (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2)); diff --git a/mysql-test/r/subselect_extra_no_semijoin.result b/mysql-test/r/subselect_extra_no_semijoin.result index 79bca388181..c77bb428ae5 100644 --- a/mysql-test/r/subselect_extra_no_semijoin.result +++ b/mysql-test/r/subselect_extra_no_semijoin.result @@ -136,6 +136,7 @@ create index idx_t1_1 on t1 (a1,a2,b,c); create index idx_t1_2 on t1 (a1,a2,b); analyze table t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Table is already up to date create table t2 ( a1 char(64), a2 char(64) not null, b char(16), c char(16), d char(16), dummy char(64) default ' ' @@ -163,6 +164,7 @@ create index idx_t2_1 on t2 (a1,a2,b,c); create index idx_t2_2 on t2 (a1,a2,b); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status Table is already up to date create table t3 ( a1 char(1), a2 char(1), b char(1), c char(4) not null, d char(3), dummy char(1) default ' ' @@ -224,6 +226,7 @@ create index idx_t3_1 on t3 (a1,a2,b,c); create index idx_t3_2 on t3 (a1,a2,b); analyze table t3; Table Op Msg_type Msg_text +test.t3 analyze status Engine-independent statistics collected test.t3 analyze status Table is already up to date explain select a1,a2,b,c,min(c), max(c) from t1 where exists ( select * from t2 @@ -306,6 +309,7 @@ INSERT INTO t1 SELECT a + 64,b FROM t1; INSERT INTO t1 SELECT a + 128,b FROM t1 limit 16; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK EXPLAIN SELECT 1 FROM t1 WHERE a IN (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2)); diff --git a/mysql-test/r/subselect_innodb.result b/mysql-test/r/subselect_innodb.result index cfbe5d41418..db5e1dac811 100644 --- a/mysql-test/r/subselect_innodb.result +++ b/mysql-test/r/subselect_innodb.result @@ -532,6 +532,7 @@ update t2 set key2=key1; alter table t2 add key(key2); analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK flush tables; # Table tsubq must use 'ref' + Using filesort (not 'index' w/o filesort) diff --git a/mysql-test/r/subselect_mat_cost_bugs.result b/mysql-test/r/subselect_mat_cost_bugs.result index 24640154c59..4cf5ffc7c3d 100644 --- a/mysql-test/r/subselect_mat_cost_bugs.result +++ b/mysql-test/r/subselect_mat_cost_bugs.result @@ -310,6 +310,7 @@ create index key3 on t2 (kp2); SET @@optimizer_switch='materialization=off,semijoin=off,in_to_exists=on'; analyze table t2; Table Op Msg_type Msg_text +test.t2 analyze status Engine-independent statistics collected test.t2 analyze status OK explain select c1 from t1 where c1 in (select kp1 from t2 where kp2 = 10 and c2 = 4) or c1 > 7; diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index a692af93b37..209c65180e2 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1373,7 +1373,7 @@ t3 CREATE TABLE `t3` ( drop tables t1,t2,t3; SELECT @tmp_max:= @@global.max_allowed_packet; @tmp_max:= @@global.max_allowed_packet -4194304 +16777216 SET @@global.max_allowed_packet=25000000; Warnings: Warning 1292 Truncated incorrect max_allowed_packet value: '25000000' diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index b78b3caa58d..50379a5feaf 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1278,12 +1278,12 @@ ERROR HY000: Variable 'lower_case_table_names' is a read only variable # SHOW VARIABLES like 'myisam_recover_options'; Variable_name Value -myisam_recover_options DEFAULT +myisam_recover_options BACKUP,FORCE SELECT @@session.myisam_recover_options; ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable SELECT @@global.myisam_recover_options; @@global.myisam_recover_options -DEFAULT +BACKUP,FORCE SET @@session.myisam_recover_options= 'x'; ERROR HY000: Variable 'myisam_recover_options' is a read only variable SET @@global.myisam_recover_options= 'x'; @@ -1532,7 +1532,7 @@ SET @@global.key_buffer_size=@kbs; SET @@global.key_cache_block_size=@kcbs; select @@max_long_data_size; @@max_long_data_size -4194304 +16777216 # # Bug#11766424 59527: # Assert in DECIMAL_BIN_SIZE: diff --git a/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result b/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result index 04c45aa0dbb..435a3ea5a13 100644 --- a/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result @@ -1,21 +1,21 @@ SET @start_global_value = @@global.aria_recover_options; select @@global.aria_recover_options; @@global.aria_recover_options -NORMAL +BACKUP,FORCE select @@session.aria_recover_options; ERROR HY000: Variable 'aria_recover_options' is a GLOBAL variable show global variables like 'aria_recover_options'; Variable_name Value -aria_recover_options NORMAL +aria_recover_options BACKUP,FORCE show session variables like 'aria_recover_options'; Variable_name Value -aria_recover_options NORMAL +aria_recover_options BACKUP,FORCE select * from information_schema.global_variables where variable_name='aria_recover_options'; VARIABLE_NAME VARIABLE_VALUE -ARIA_RECOVER_OPTIONS NORMAL +ARIA_RECOVER_OPTIONS BACKUP,FORCE select * from information_schema.session_variables where variable_name='aria_recover_options'; VARIABLE_NAME VARIABLE_VALUE -ARIA_RECOVER_OPTIONS NORMAL +ARIA_RECOVER_OPTIONS BACKUP,FORCE set global aria_recover_options=1; select @@global.aria_recover_options; @@global.aria_recover_options diff --git a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result index 6fef4fc1d32..cfebfe905b1 100644 --- a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result +++ b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result @@ -1,22 +1,22 @@ SET @start_global_value = @@global.binlog_annotate_row_events; select @@global.binlog_annotate_row_events; @@global.binlog_annotate_row_events -0 +1 select @@session.binlog_annotate_row_events; @@session.binlog_annotate_row_events -0 +1 show global variables like 'binlog_annotate_row_events'; Variable_name Value -binlog_annotate_row_events OFF +binlog_annotate_row_events ON show session variables like 'binlog_annotate_row_events'; Variable_name Value -binlog_annotate_row_events OFF +binlog_annotate_row_events ON select * from information_schema.global_variables where variable_name='binlog_annotate_row_events'; VARIABLE_NAME VARIABLE_VALUE -BINLOG_ANNOTATE_ROW_EVENTS OFF +BINLOG_ANNOTATE_ROW_EVENTS ON select * from information_schema.session_variables where variable_name='binlog_annotate_row_events'; VARIABLE_NAME VARIABLE_VALUE -BINLOG_ANNOTATE_ROW_EVENTS OFF +BINLOG_ANNOTATE_ROW_EVENTS ON set global binlog_annotate_row_events=ON; select @@global.binlog_annotate_row_events; @@global.binlog_annotate_row_events diff --git a/mysql-test/suite/sys_vars/r/binlog_format_basic.result b/mysql-test/suite/sys_vars/r/binlog_format_basic.result index 0d76d9686e3..a14fb505e6d 100644 --- a/mysql-test/suite/sys_vars/r/binlog_format_basic.result +++ b/mysql-test/suite/sys_vars/r/binlog_format_basic.result @@ -1,6 +1,6 @@ SELECT @@GLOBAL.binlog_format; @@GLOBAL.binlog_format -STATEMENT +MIXED '#---------------------BS_STVARS_002_01----------------------#' SET @start_value= @@global.binlog_format; SELECT COUNT(@@GLOBAL.binlog_format); diff --git a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result index 48126d33ee8..fa1cc5554b0 100644 --- a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result +++ b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result @@ -1,22 +1,22 @@ SET @start_global_value = @@global.group_concat_max_len; SELECT @start_global_value; @start_global_value -1024 +1048576 SET @start_session_value = @@session.group_concat_max_len; SELECT @start_session_value; @start_session_value -1024 +1048576 '#--------------------FN_DYNVARS_034_01-------------------------#' SET @@global.group_concat_max_len = 100; SET @@global.group_concat_max_len = DEFAULT; SELECT @@global.group_concat_max_len; @@global.group_concat_max_len -1024 +1048576 SET @@session.group_concat_max_len = 200; SET @@session.group_concat_max_len = DEFAULT; SELECT @@session.group_concat_max_len; @@session.group_concat_max_len -1024 +1048576 '#--------------------FN_DYNVARS_034_02-------------------------#' SET @@global.group_concat_max_len = DEFAULT; SELECT @@global.group_concat_max_len = 1; @@ -160,8 +160,8 @@ ERROR 42S22: Unknown column 'group_concat_max_len' in 'field list' SET @@global.group_concat_max_len = @start_global_value; SELECT @@global.group_concat_max_len; @@global.group_concat_max_len -1024 +1048576 SET @@session.group_concat_max_len = @start_session_value; SELECT @@session.group_concat_max_len; @@session.group_concat_max_len -1024 +1048576 diff --git a/mysql-test/suite/sys_vars/r/histogram_size_basic.result b/mysql-test/suite/sys_vars/r/histogram_size_basic.result index 1f310600d00..89a49a64463 100644 --- a/mysql-test/suite/sys_vars/r/histogram_size_basic.result +++ b/mysql-test/suite/sys_vars/r/histogram_size_basic.result @@ -1,20 +1,20 @@ SET @start_global_value = @@global.histogram_size; SELECT @start_global_value; @start_global_value -0 +255 SET @start_session_value = @@session.histogram_size; SELECT @start_session_value; @start_session_value -0 +255 '#--------------------FN_DYNVARS_053_01-------------------------#' SET @@global.histogram_size = DEFAULT; SELECT @@global.histogram_size; @@global.histogram_size -0 +255 SET @@session.histogram_size = DEFAULT; SELECT @@session.histogram_size; @@session.histogram_size -0 +255 '#--------------------FN_DYNVARS_053_03-------------------------#' SET @@global.histogram_size = 1; SELECT @@global.histogram_size; @@ -129,8 +129,8 @@ SELECT @@local.histogram_size = @@session.histogram_size; SET @@global.histogram_size = @start_global_value; SELECT @@global.histogram_size; @@global.histogram_size -0 +255 SET @@session.histogram_size = @start_session_value; SELECT @@session.histogram_size; @@session.histogram_size -0 +255 diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result index 26bb44b4587..8b872ea2864 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result @@ -1,7 +1,7 @@ SET @orig = @@global.innodb_buffer_pool_dump_at_shutdown; SELECT @orig; @orig -0 +1 SET GLOBAL innodb_buffer_pool_dump_at_shutdown = OFF; SELECT @@global.innodb_buffer_pool_dump_at_shutdown; @@global.innodb_buffer_pool_dump_at_shutdown diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result index 51c72cfe791..a1dfb4f00a1 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_pct_basic.result @@ -1,7 +1,7 @@ SET @orig = @@global.innodb_buffer_pool_dump_pct; SELECT @orig; @orig -100 +25 SET GLOBAL innodb_buffer_pool_dump_pct=3, GLOBAL innodb_buffer_pool_dump_now = ON; SET GLOBAL innodb_buffer_pool_dump_pct=0; SELECT @@global.innodb_buffer_pool_dump_pct; diff --git a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result index 1dad72baefd..cd4c924b425 100644 --- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result @@ -1,7 +1,7 @@ SET @orig = @@global.innodb_buffer_pool_load_at_startup; SELECT @orig; @orig -0 +1 SET GLOBAL innodb_buffer_pool_load_at_startup = OFF; ERROR HY000: Variable 'innodb_buffer_pool_load_at_startup' is a read only variable SET GLOBAL innodb_buffer_pool_load_at_startup = ON; diff --git a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result index 8e05db129dc..ad1dba60afd 100644 --- a/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result @@ -1,7 +1,7 @@ SET @orig = @@global.innodb_checksum_algorithm; SELECT @orig; @orig -INNODB +CRC32 SET GLOBAL innodb_checksum_algorithm = 'crc32'; SELECT @@global.innodb_checksum_algorithm; @@global.innodb_checksum_algorithm @@ -44,4 +44,4 @@ STRICT_NONE SET GLOBAL innodb_checksum_algorithm = @orig; SELECT @@global.innodb_checksum_algorithm; @@global.innodb_checksum_algorithm -INNODB +CRC32 diff --git a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result index 58e009ea705..41369038cf6 100644 --- a/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_file_format_basic.result @@ -1,28 +1,28 @@ SET @start_global_value = @@global.innodb_file_format; SELECT @start_global_value; @start_global_value -Antelope +Barracuda Valid values are 'Antelope' and 'Barracuda' select @@global.innodb_file_format in ('Antelope', 'Barracuda'); @@global.innodb_file_format in ('Antelope', 'Barracuda') 1 select @@global.innodb_file_format; @@global.innodb_file_format -Antelope +Barracuda select @@session.innodb_file_format; ERROR HY000: Variable 'innodb_file_format' is a GLOBAL variable show global variables like 'innodb_file_format'; Variable_name Value -innodb_file_format Antelope +innodb_file_format Barracuda show session variables like 'innodb_file_format'; Variable_name Value -innodb_file_format Antelope +innodb_file_format Barracuda select * from information_schema.global_variables where variable_name='innodb_file_format'; VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Antelope +INNODB_FILE_FORMAT Barracuda select * from information_schema.session_variables where variable_name='innodb_file_format'; VARIABLE_NAME VARIABLE_VALUE -INNODB_FILE_FORMAT Antelope +INNODB_FILE_FORMAT Barracuda set global innodb_file_format='Antelope'; select @@global.innodb_file_format; @@global.innodb_file_format @@ -56,4 +56,4 @@ ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Salmon' SET @@global.innodb_file_format = @start_global_value; SELECT @@global.innodb_file_format; @@global.innodb_file_format -Antelope +Barracuda diff --git a/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result b/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result index 3877988bbee..ae42c2f94e3 100644 --- a/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result @@ -1,28 +1,28 @@ SET @start_global_value = @@global.innodb_large_prefix; SELECT @start_global_value; @start_global_value -0 +1 Valid values are 'ON' and 'OFF' select @@global.innodb_large_prefix in (0, 1); @@global.innodb_large_prefix in (0, 1) 1 select @@global.innodb_large_prefix; @@global.innodb_large_prefix -0 +1 select @@session.innodb_large_prefix; ERROR HY000: Variable 'innodb_large_prefix' is a GLOBAL variable show global variables like 'innodb_large_prefix'; Variable_name Value -innodb_large_prefix OFF +innodb_large_prefix ON show session variables like 'innodb_large_prefix'; Variable_name Value -innodb_large_prefix OFF +innodb_large_prefix ON select * from information_schema.global_variables where variable_name='innodb_large_prefix'; VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF +INNODB_LARGE_PREFIX ON select * from information_schema.session_variables where variable_name='innodb_large_prefix'; VARIABLE_NAME VARIABLE_VALUE -INNODB_LARGE_PREFIX OFF +INNODB_LARGE_PREFIX ON set global innodb_large_prefix='OFF'; select @@global.innodb_large_prefix; @@global.innodb_large_prefix @@ -89,4 +89,4 @@ ERROR 42000: Variable 'innodb_large_prefix' can't be set to the value of 'AUTO' SET @@global.innodb_large_prefix = @start_global_value; SELECT @@global.innodb_large_prefix; @@global.innodb_large_prefix -0 +1 diff --git a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result index 3b1ad38fd31..8cb8d900b59 100644 --- a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result @@ -1,7 +1,7 @@ SET @start_global_value = @@global.innodb_log_compressed_pages; SELECT @start_global_value; @start_global_value -0 +1 '#---------------------BS_STVARS_028_01----------------------#' SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages); COUNT(@@GLOBAL.innodb_log_compressed_pages) @@ -66,4 +66,4 @@ ERROR 42S22: Unknown column 'innodb_log_compressed_pages' in 'field list' SET @@global.innodb_log_compressed_pages = @start_global_value; SELECT @@global.innodb_log_compressed_pages; @@global.innodb_log_compressed_pages -0 +1 diff --git a/mysql-test/suite/sys_vars/r/innodb_stats_traditional_basic.result b/mysql-test/suite/sys_vars/r/innodb_stats_traditional_basic.result index 00ee2877e58..754a8dfd980 100644 --- a/mysql-test/suite/sys_vars/r/innodb_stats_traditional_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_stats_traditional_basic.result @@ -1,28 +1,28 @@ SET @start_global_value = @@global.innodb_stats_traditional; SELECT @start_global_value; @start_global_value -1 +0 Valid values are 'ON' and 'OFF' select @@global.innodb_stats_traditional in (0, 1); @@global.innodb_stats_traditional in (0, 1) 1 select @@global.innodb_stats_traditional; @@global.innodb_stats_traditional -1 +0 select @@session.innodb_stats_traditional; ERROR HY000: Variable 'innodb_stats_traditional' is a GLOBAL variable show global variables like 'innodb_stats_traditional'; Variable_name Value -innodb_stats_traditional ON +innodb_stats_traditional OFF show session variables like 'innodb_stats_traditional'; Variable_name Value -innodb_stats_traditional ON +innodb_stats_traditional OFF select * from information_schema.global_variables where variable_name='innodb_stats_traditional'; VARIABLE_NAME VARIABLE_VALUE -INNODB_STATS_TRADITIONAL ON +INNODB_STATS_TRADITIONAL OFF select * from information_schema.session_variables where variable_name='innodb_stats_traditional'; VARIABLE_NAME VARIABLE_VALUE -INNODB_STATS_TRADITIONAL ON +INNODB_STATS_TRADITIONAL OFF set global innodb_stats_traditional='OFF'; select @@global.innodb_stats_traditional; @@global.innodb_stats_traditional @@ -89,4 +89,4 @@ ERROR 42000: Variable 'innodb_stats_traditional' can't be set to the value of 'A SET @@global.innodb_stats_traditional = @start_global_value; SELECT @@global.innodb_stats_traditional; @@global.innodb_stats_traditional -1 +0 diff --git a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result index 9c5e62d2684..8bddb6a1694 100644 --- a/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result @@ -1,32 +1,32 @@ SET @start_global_value = @@global.innodb_strict_mode; SELECT @start_global_value; @start_global_value -0 +1 Valid values are 'ON' and 'OFF' select @@global.innodb_strict_mode in (0, 1); @@global.innodb_strict_mode in (0, 1) 1 select @@global.innodb_strict_mode; @@global.innodb_strict_mode -0 +1 select @@session.innodb_strict_mode in (0, 1); @@session.innodb_strict_mode in (0, 1) 1 select @@session.innodb_strict_mode; @@session.innodb_strict_mode -0 +1 show global variables like 'innodb_strict_mode'; Variable_name Value -innodb_strict_mode OFF +innodb_strict_mode ON show session variables like 'innodb_strict_mode'; Variable_name Value -innodb_strict_mode OFF +innodb_strict_mode ON select * from information_schema.global_variables where variable_name='innodb_strict_mode'; VARIABLE_NAME VARIABLE_VALUE -INNODB_STRICT_MODE OFF +INNODB_STRICT_MODE ON select * from information_schema.session_variables where variable_name='innodb_strict_mode'; VARIABLE_NAME VARIABLE_VALUE -INNODB_STRICT_MODE OFF +INNODB_STRICT_MODE ON set global innodb_strict_mode='OFF'; set session innodb_strict_mode='OFF'; select @@global.innodb_strict_mode; @@ -118,4 +118,4 @@ INNODB_STRICT_MODE ON SET @@global.innodb_strict_mode = @start_global_value; SELECT @@global.innodb_strict_mode; @@global.innodb_strict_mode -0 +1 diff --git a/mysql-test/suite/sys_vars/r/long_query_time_basic.result b/mysql-test/suite/sys_vars/r/long_query_time_basic.result index 2fb9ff143ac..0e28f6df09f 100644 --- a/mysql-test/suite/sys_vars/r/long_query_time_basic.result +++ b/mysql-test/suite/sys_vars/r/long_query_time_basic.result @@ -1,31 +1,31 @@ SET @start_global_value = @@global.long_query_time; SELECT @start_global_value; @start_global_value -10 +2 SET @start_session_value = @@session.long_query_time; SELECT @start_session_value; @start_session_value -10 +2 '#--------------------FN_DYNVARS_068_01-------------------------#' SET @@global.long_query_time = 100; SET @@global.long_query_time = DEFAULT; SELECT @@global.long_query_time; @@global.long_query_time -10.000000 +2.000000 SET @@session.long_query_time = 200; SET @@session.long_query_time = DEFAULT; SELECT @@session.long_query_time; @@session.long_query_time -10.000000 +2.000000 '#--------------------FN_DYNVARS_068_02-------------------------#' SET @@global.long_query_time = DEFAULT; SELECT @@global.long_query_time = 10; @@global.long_query_time = 10 -1 +0 SET @@session.long_query_time = DEFAULT; SELECT @@session.long_query_time = 10; @@session.long_query_time = 10 -1 +0 '#--------------------FN_DYNVARS_068_03-------------------------#' SET @@global.long_query_time = 0; SELECT @@global.long_query_time; @@ -159,8 +159,8 @@ ERROR 42S22: Unknown column 'long_query_time' in 'field list' SET @@global.long_query_time = @start_global_value; SELECT @@global.long_query_time; @@global.long_query_time -10.000000 +2.000000 SET @@session.long_query_time = @start_session_value; SELECT @@session.long_query_time; @@session.long_query_time -10.000000 +2.000000 diff --git a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result index ec99256a862..10bda48dd43 100644 --- a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result +++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result @@ -1,7 +1,7 @@ SET @start_global_value = @@global.max_allowed_packet; SELECT @start_global_value; @start_global_value -4194304 +16777216 SET @@global.max_allowed_packet = DEFAULT; connect conn1, localhost, root,,; '#--------------------FN_DYNVARS_070_01-------------------------#' @@ -12,14 +12,14 @@ Warning 1708 The value of 'max_allowed_packet' should be no less than the value SET @@global.max_allowed_packet = DEFAULT; SELECT @@global.max_allowed_packet; @@global.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 20000; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SET @@session.max_allowed_packet = DEFAULT; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 '#--------------------FN_DYNVARS_070_02-------------------------#' SET @@global.max_allowed_packet = DEFAULT; SELECT @@global.max_allowed_packet = 1048576; @@ -54,27 +54,27 @@ SET @@session.max_allowed_packet = 1024; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 1025; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 65535; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 1073741824; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 1073741823; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 '#------------------FN_DYNVARS_070_05-----------------------#' SET @@global.max_allowed_packet = 0; Warnings: @@ -117,29 +117,29 @@ SET @@session.max_allowed_packet = 0; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 1023; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = -2; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = 65530.34; ERROR 42000: Incorrect argument type to variable 'max_allowed_packet' SET @@session.max_allowed_packet = 10737418241; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.max_allowed_packet = test; ERROR 42000: Incorrect argument type to variable 'max_allowed_packet' SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 '#------------------FN_DYNVARS_070_06-----------------------#' SELECT @@global.max_allowed_packet = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -188,7 +188,7 @@ SET max_allowed_packet = 1024; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@max_allowed_packet; @@max_allowed_packet -4194304 +16777216 SELECT local.max_allowed_packet; ERROR 42S02: Unknown table 'local' in field list SELECT session.max_allowed_packet; @@ -199,7 +199,7 @@ connection default; SET @@global.max_allowed_packet = @start_global_value; SELECT @@global.max_allowed_packet; @@global.max_allowed_packet -4194304 +16777216 SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 diff --git a/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result index c31a64b3a94..62d543d0a0f 100644 --- a/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result +++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result @@ -14,7 +14,7 @@ SET @@session.max_allowed_packet = 1024; ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value SELECT @@session.max_allowed_packet; @@session.max_allowed_packet -4194304 +16777216 SET @@session.net_buffer_length = 1024; ERROR HY000: SESSION variable 'net_buffer_length' is read-only. Use SET GLOBAL to assign the value SELECT @@session.net_buffer_length; diff --git a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result index 1798bd5d6e0..f833f417290 100644 --- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result +++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result @@ -70,6 +70,7 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ALL NULL NULL NULL NULL 17 Using where; Using join buffer (flat, BNL join) ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SET MAX_SEEKS_FOR_KEY=1; EXPLAIN SELECT STRAIGHT_JOIN * FROM t1,t1 AS t2 WHERE t1.b = t2.b; diff --git a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result index 3fc0f563298..7bdcc2bbe70 100644 --- a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result +++ b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result @@ -1,20 +1,20 @@ select @@global.myisam_recover_options; @@global.myisam_recover_options -DEFAULT +BACKUP,FORCE select @@session.myisam_recover_options; ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable show global variables like 'myisam_recover_options'; Variable_name Value -myisam_recover_options DEFAULT +myisam_recover_options BACKUP,FORCE show session variables like 'myisam_recover_options'; Variable_name Value -myisam_recover_options DEFAULT +myisam_recover_options BACKUP,FORCE select * from information_schema.global_variables where variable_name='myisam_recover_options'; VARIABLE_NAME VARIABLE_VALUE -MYISAM_RECOVER_OPTIONS DEFAULT +MYISAM_RECOVER_OPTIONS BACKUP,FORCE select * from information_schema.session_variables where variable_name='myisam_recover_options'; VARIABLE_NAME VARIABLE_VALUE -MYISAM_RECOVER_OPTIONS DEFAULT +MYISAM_RECOVER_OPTIONS BACKUP,FORCE set global myisam_recover_options=1; ERROR HY000: Variable 'myisam_recover_options' is a read only variable set session myisam_recover_options=1; diff --git a/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result index cae0e68765b..b675b97e26b 100644 --- a/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result +++ b/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result @@ -20,6 +20,7 @@ INSERT INTO t1 SELECT NULL FROM t1; SET myisam_stats_method = nulls_unequal; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -38,6 +39,7 @@ INSERT INTO t1 VALUES (11); DELETE FROM t1 WHERE a = 11; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -66,6 +68,7 @@ INSERT INTO t1 VALUES ('bce','def1', 'yuu', NULL); INSERT INTO t1 VALUES ('bce','def2', NULL, 'quux'); ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment @@ -76,6 +79,7 @@ t1 1 a 4 d A 4 NULL NULL YES BTREE DELETE FROM t1; ANALYZE TABLE t1; Table Op Msg_type Msg_text +test.t1 analyze status Engine-independent statistics collected test.t1 analyze status OK SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment diff --git a/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result b/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result index 802c92268d6..08298a4f316 100644 --- a/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result +++ b/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result @@ -1,20 +1,20 @@ select @@global.replicate_annotate_row_events; @@global.replicate_annotate_row_events -0 +1 select @@session.replicate_annotate_row_events; ERROR HY000: Variable 'replicate_annotate_row_events' is a GLOBAL variable show global variables like 'replicate_annotate_row_events'; Variable_name Value -replicate_annotate_row_events OFF +replicate_annotate_row_events ON show session variables like 'replicate_annotate_row_events'; Variable_name Value -replicate_annotate_row_events OFF +replicate_annotate_row_events ON select * from information_schema.global_variables where variable_name='replicate_annotate_row_events'; VARIABLE_NAME VARIABLE_VALUE -REPLICATE_ANNOTATE_ROW_EVENTS OFF +REPLICATE_ANNOTATE_ROW_EVENTS ON select * from information_schema.session_variables where variable_name='replicate_annotate_row_events'; VARIABLE_NAME VARIABLE_VALUE -REPLICATE_ANNOTATE_ROW_EVENTS OFF +REPLICATE_ANNOTATE_ROW_EVENTS ON set global replicate_annotate_row_events=1; ERROR HY000: Variable 'replicate_annotate_row_events' is a read only variable set session replicate_annotate_row_events=1; diff --git a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result index 1ef0b27b756..1b4d62c6c00 100644 --- a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result +++ b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result @@ -7,12 +7,12 @@ SET @@global.slave_net_timeout = 500000; SET @@global.slave_net_timeout = DEFAULT; SELECT @@global.slave_net_timeout; @@global.slave_net_timeout -3600 +60 '#--------------------FN_DYNVARS_146_02-------------------------#' SET @@global.slave_net_timeout = DEFAULT; SELECT @@global.slave_net_timeout = 3600; @@global.slave_net_timeout = 3600 -1 +0 '#--------------------FN_DYNVARS_146_03-------------------------#' SET @@global.slave_net_timeout = 0; Warnings: diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result index bb0c8136391..2f070d05e52 100644 --- a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result +++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result @@ -1,18 +1,18 @@ SET @start_value = @@global.sync_binlog; SELECT @start_value; @start_value -0 +1 '#--------------------FN_DYNVARS_168_01------------------------#' SET @@global.sync_binlog = 99; SET @@global.sync_binlog = DEFAULT; SELECT @@global.sync_binlog; @@global.sync_binlog -0 +1 '#---------------------FN_DYNVARS_168_02-------------------------#' SET @@global.sync_binlog = @start_value; SELECT @@global.sync_binlog = 0; @@global.sync_binlog = 0 -1 +0 '#--------------------FN_DYNVARS_168_03------------------------#' SET @@global.sync_binlog = 0; SELECT @@global.sync_binlog; @@ -111,4 +111,4 @@ ERROR 42S22: Unknown column 'sync_binlog' in 'field list' SET @@global.sync_binlog = @start_value; SELECT @@global.sync_binlog; @@global.sync_binlog -0 +1 diff --git a/mysql-test/suite/sys_vars/r/sysvars_aria.result b/mysql-test/suite/sys_vars/r/sysvars_aria.result index f2418cf31db..f173a5c0cee 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_aria.result +++ b/mysql-test/suite/sys_vars/r/sysvars_aria.result @@ -213,9 +213,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME ARIA_RECOVER_OPTIONS SESSION_VALUE NULL -GLOBAL_VALUE NORMAL +GLOBAL_VALUE BACKUP,FORCE GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE NORMAL +DEFAULT_VALUE BACKUP,FORCE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE SET VARIABLE_COMMENT Specifies how corrupted tables should be automatically repaired diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result index 9f92ea99437..5f0e91ef26f 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result @@ -231,9 +231,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_AT_SHUTDOWN SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Dump the buffer pool into a file named @@innodb_buffer_pool_filename @@ -259,12 +259,12 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_BUFFER_POOL_DUMP_PCT SESSION_VALUE NULL -GLOBAL_VALUE 100 +GLOBAL_VALUE 25 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 100 +DEFAULT_VALUE 25 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED -VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 100 +VARIABLE_COMMENT Dump only the hottest N% of each buffer pool, defaults to 25 NUMERIC_MIN_VALUE 1 NUMERIC_MAX_VALUE 100 NUMERIC_BLOCK_SIZE 0 @@ -329,9 +329,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_BUFFER_POOL_LOAD_AT_STARTUP SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Load the buffer pool from a file named @@innodb_buffer_pool_filename @@ -455,9 +455,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT NONE VARIABLE_NAME INNODB_CHECKSUM_ALGORITHM SESSION_VALUE NULL -GLOBAL_VALUE INNODB +GLOBAL_VALUE CRC32 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE INNODB +DEFAULT_VALUE CRC32 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE ENUM VARIABLE_COMMENT The algorithm InnoDB uses for page checksumming. Possible values are CRC32 (hardware accelerated if the CPU supports it) write crc32, allow any of the other checksums to match when reading; STRICT_CRC32 write crc32, do not allow other algorithms to match when reading; INNODB write a software calculated checksum, allow any other checksums to match when reading; STRICT_INNODB write a software calculated checksum, do not allow other algorithms to match when reading; NONE write a constant magic number, do not do any checksum verification when reading (same as innodb_checksums=OFF); STRICT_NONE write a constant magic number, do not allow values other than that magic number when reading; Files updated when this option is set to crc32 or strict_crc32 will not be readable by MySQL versions older than 5.6.3 @@ -861,9 +861,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_FILE_FORMAT SESSION_VALUE NULL -GLOBAL_VALUE Antelope +GLOBAL_VALUE Barracuda GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE Antelope +DEFAULT_VALUE Barracuda VARIABLE_SCOPE GLOBAL VARIABLE_TYPE VARCHAR VARIABLE_COMMENT File format to use for new tables in .ibd files. @@ -1295,9 +1295,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_LARGE_PREFIX SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Support large index prefix length of REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes. @@ -1379,9 +1379,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_LOG_COMPRESSED_PAGES SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Enables/disables the logging of entire compressed page images. InnoDB logs the compressed pages to prevent corruption if the zlib compression algorithm changes. When turned OFF, InnoDB will assume that the zlib compression algorithm doesn't change. @@ -1409,7 +1409,7 @@ VARIABLE_NAME INNODB_LOG_FILE_SIZE SESSION_VALUE NULL GLOBAL_VALUE 5242880 GLOBAL_VALUE_ORIGIN CONFIG -DEFAULT_VALUE 50331648 +DEFAULT_VALUE 134217728 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT VARIABLE_COMMENT Size of each log file in a log group. @@ -1757,9 +1757,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_PURGE_THREADS SESSION_VALUE NULL -GLOBAL_VALUE 1 +GLOBAL_VALUE 4 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 1 +DEFAULT_VALUE 4 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Purge threads can be from 1 to 32. Default is 1. @@ -2051,12 +2051,12 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME INNODB_STATS_TRADITIONAL SESSION_VALUE NULL -GLOBAL_VALUE ON +GLOBAL_VALUE OFF GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE ON +DEFAULT_VALUE OFF VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN -VARIABLE_COMMENT Enable traditional statistic calculation based on number of configured pages (default true) +VARIABLE_COMMENT Enable traditional statistic calculation based on number of configured pages (default false) NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL @@ -2106,10 +2106,10 @@ ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_STRICT_MODE -SESSION_VALUE OFF -GLOBAL_VALUE OFF +SESSION_VALUE ON +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Use strict mode when evaluating create options. diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index e422be7287e..6f0d1cb9f42 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -122,10 +122,10 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BINLOG_ANNOTATE_ROW_EVENTS -SESSION_VALUE OFF -GLOBAL_VALUE OFF +SESSION_VALUE ON +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE SESSION VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Tells the master to annotate RBR events with the statement that caused these events @@ -206,10 +206,10 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME BINLOG_FORMAT -SESSION_VALUE STATEMENT -GLOBAL_VALUE STATEMENT +SESSION_VALUE MIXED +GLOBAL_VALUE MIXED GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE STATEMENT +DEFAULT_VALUE MIXED VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM VARIABLE_COMMENT What form of binary logging the master will use: either ROW for row-based binary logging, STATEMENT for statement-based binary logging, or MIXED. MIXED is statement-based binary logging except for those statements where only row-based is correct: those which involve user-defined functions (i.e. UDFs) or the UUID() function; for those, row-based binary logging is automatically used. @@ -1032,10 +1032,10 @@ ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME GROUP_CONCAT_MAX_LEN -SESSION_VALUE 1024 -GLOBAL_VALUE 1024 +SESSION_VALUE 1048576 +GLOBAL_VALUE 1048576 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 1024 +DEFAULT_VALUE 1048576 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT The maximum length of the result of function GROUP_CONCAT() @@ -1270,10 +1270,10 @@ ENUM_VALUE_LIST NULL READ_ONLY YES COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME HISTOGRAM_SIZE -SESSION_VALUE 0 -GLOBAL_VALUE 0 +SESSION_VALUE 255 +GLOBAL_VALUE 255 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 +DEFAULT_VALUE 255 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Number of bytes used for a histogram. If set to 0, no histograms are created by ANALYZE. @@ -1928,10 +1928,10 @@ ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME LONG_QUERY_TIME -SESSION_VALUE 10.000000 -GLOBAL_VALUE 10.000000 +SESSION_VALUE 2.000000 +GLOBAL_VALUE 2.000000 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 10.000000 +DEFAULT_VALUE 2.000000 VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE VARIABLE_COMMENT Log all queries that have taken more than long_query_time seconds to execute to file. The argument will be treated as a decimal value with microsecond precision @@ -1970,10 +1970,10 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME MAX_ALLOWED_PACKET -SESSION_VALUE 4194304 -GLOBAL_VALUE 4194304 +SESSION_VALUE 16777216 +GLOBAL_VALUE 16777216 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 4194304 +DEFAULT_VALUE 16777216 VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Max packet length to send to or receive from the server @@ -2153,7 +2153,7 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MAX_LONG_DATA_SIZE SESSION_VALUE NULL -GLOBAL_VALUE 4194304 +GLOBAL_VALUE 16777216 GLOBAL_VALUE_ORIGIN AUTO DEFAULT_VALUE 1048576 VARIABLE_SCOPE GLOBAL @@ -2419,9 +2419,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME MYISAM_RECOVER_OPTIONS SESSION_VALUE NULL -GLOBAL_VALUE DEFAULT +GLOBAL_VALUE BACKUP,FORCE GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE DEFAULT +DEFAULT_VALUE BACKUP,FORCE VARIABLE_SCOPE GLOBAL VARIABLE_TYPE SET VARIABLE_COMMENT Specifies how corrupted tables should be automatically repaired @@ -3567,9 +3567,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME REPLICATE_ANNOTATE_ROW_EVENTS SESSION_VALUE NULL -GLOBAL_VALUE OFF +GLOBAL_VALUE ON GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE OFF +DEFAULT_VALUE ON VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BOOLEAN VARIABLE_COMMENT Tells the slave to write annotate rows events received from the master to its own binary log. Ignored if log_slave_updates is not set @@ -4017,7 +4017,7 @@ VARIABLE_NAME SLAVE_NET_TIMEOUT SESSION_VALUE NULL GLOBAL_VALUE 120 GLOBAL_VALUE_ORIGIN CONFIG -DEFAULT_VALUE 3600 +DEFAULT_VALUE 60 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Number of seconds to wait for more data from any master/slave connection before aborting the read @@ -4533,9 +4533,9 @@ READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME SYNC_BINLOG SESSION_VALUE NULL -GLOBAL_VALUE 0 +GLOBAL_VALUE 1 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 0 +DEFAULT_VALUE 1 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE INT UNSIGNED VARIABLE_COMMENT Synchronously flush binary log to disk after every #th event. Use 0 (default) to disable synchronous flushing @@ -4938,10 +4938,10 @@ ENUM_VALUE_LIST OFF,ON READ_ONLY NO COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME USE_STAT_TABLES -SESSION_VALUE NEVER -GLOBAL_VALUE NEVER +SESSION_VALUE COMPLEMENTARY +GLOBAL_VALUE COMPLEMENTARY GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE NEVER +DEFAULT_VALUE COMPLEMENTARY VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM VARIABLE_COMMENT Specifies how to use system statistics tables diff --git a/mysql-test/suite/sys_vars/r/use_stat_tables_basic.result b/mysql-test/suite/sys_vars/r/use_stat_tables_basic.result index 64f6d868fa6..2073bc92602 100644 --- a/mysql-test/suite/sys_vars/r/use_stat_tables_basic.result +++ b/mysql-test/suite/sys_vars/r/use_stat_tables_basic.result @@ -1,16 +1,16 @@ SET @start_global_value = @@global.use_stat_tables; SELECT @start_global_value; @start_global_value -NEVER +COMPLEMENTARY SET @start_session_value = @@session.use_stat_tables; SELECT @start_session_value; @start_session_value -NEVER +COMPLEMENTARY SET @@global.use_stat_tables = 2; SET @@global.use_stat_tables = DEFAULT; SELECT @@global.use_stat_tables; @@global.use_stat_tables -NEVER +COMPLEMENTARY SET @@global.use_stat_tables = 0; SELECT @@global.use_stat_tables; @@global.use_stat_tables @@ -87,9 +87,9 @@ USE_STAT_TABLES COMPLEMENTARY SET @@global.use_stat_tables = @start_global_value; SELECT @@global.use_stat_tables; @@global.use_stat_tables -NEVER +COMPLEMENTARY SET @@session.use_stat_tables = @start_session_value; SELECT @@session.use_stat_tables; @@session.use_stat_tables -NEVER +COMPLEMENTARY set sql_mode=''; diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test index bdd295d0fa9..44b9ad53062 100644 --- a/mysql-test/t/func_gconcat.test +++ b/mysql-test/t/func_gconcat.test @@ -861,7 +861,7 @@ CREATE TABLE t2 SELECT GROUP_CONCAT(UPPER(f1) ORDER BY f2) FROM t1; SHOW CREATE TABLE t2; DROP TABLE t2; -SET group_concat_max_len= DEFAULT; +SET group_concat_max_len= 1024; SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1; SET group_concat_max_len= 499999; diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test index a3a1278ef1e..fc67a0412d5 100644 --- a/mysql-test/t/join_outer.test +++ b/mysql-test/t/join_outer.test @@ -1368,6 +1368,10 @@ drop table t1,t2,t3,t4; --echo # Bug#57024: Poor performance when conjunctive condition over the outer --echo # table is used in the on condition of an outer join --echo # +let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`; +--disable_query_log +SET SESSION use_stat_tables=never; +--enable_query_log create table t1 (a int); insert into t1 values (NULL), (NULL), (NULL), (NULL); @@ -1410,6 +1414,10 @@ show status like "handler_read%"; drop table t1,t2,t3; +--disable_query_log +eval SET SESSION use_stat_tables=$use_stat_tables_saved; +--enable_query_log + --echo # --echo # Bug#57688 Assertion `!table || (!table->write_set || bitmap_is_set(table->write_set, field --echo # diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test index 62a9173b526..97130eb1a84 100644 --- a/mysql-test/t/partition_innodb.test +++ b/mysql-test/t/partition_innodb.test @@ -825,6 +825,7 @@ DROP TABLE t1; CREATE TABLE t1 (f1 VARCHAR(512) CHARACTER SET utf8) ENGINE=InnoDB; INSERT INTO t1 VALUES ('j'); +--error ER_INDEX_COLUMN_TOO_LONG CREATE TABLE t2 ( f2 VARCHAR(5) CHARACTER SET latin1, f3 VARCHAR(5) CHARACTER SET utf8, @@ -840,6 +841,22 @@ CREATE TABLE t2 ( PARTITION p1 VALUES IN (2,4,0) ); +CREATE TABLE t2 ( + f2 VARCHAR(5) CHARACTER SET latin1, + f3 VARCHAR(5) CHARACTER SET utf8, + f4 INT, + f5 VARCHAR(512) CHARACTER SET utf8, + f6 VARCHAR(256) CHARACTER SET utf8, + key (f2), + key (f3), + key (f5) +) ENGINE=InnoDB ROW_FORMAT=DYNAMIC + PARTITION BY LIST COLUMNS (f4) + SUBPARTITION BY KEY(f6) SUBPARTITIONS 4 ( + PARTITION p0 VALUES IN (1,3,9,null), + PARTITION p1 VALUES IN (2,4,0) +); + INSERT INTO t2 VALUES ('k','s',3,'b','j'),('a','b',NULL,'v','j'),('c','m',9,'t',NULL), ('b','l',9,'b',NULL),('i','y',3,'o','w'),('c','m',NULL,'a','m'), diff --git a/mysql-test/t/set_statement_notembedded_binlog.test b/mysql-test/t/set_statement_notembedded_binlog.test index 62c351ed6f7..b0c00008d4f 100644 --- a/mysql-test/t/set_statement_notembedded_binlog.test +++ b/mysql-test/t/set_statement_notembedded_binlog.test @@ -1,5 +1,6 @@ --source include/have_log_bin.inc --source include/not_embedded.inc +--source include/have_binlog_format_statement.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/stat_tables.test b/mysql-test/t/stat_tables.test index 4cbaa9e27c8..5df9d0000bc 100644 --- a/mysql-test/t/stat_tables.test +++ b/mysql-test/t/stat_tables.test @@ -6,6 +6,7 @@ select @@session.use_stat_tables; set @save_use_stat_tables=@@use_stat_tables; set use_stat_tables='preferably'; +set histogram_size=0; --disable_warnings DROP DATABASE IF EXISTS dbt3_s001; diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index e0b0d9c8838..dbe0cb6d0c2 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -352,7 +352,7 @@ DROP FUNCTION f1; # # Test of internal temporary table status variables # - +SET SESSION use_stat_tables = never; flush status; create table t1 (a int not null auto_increment primary key, g int, b blob); insert into t1 (g,b) values (1,'a'), (2, 'b'), (3, 'b'), (1, 'c'); @@ -363,6 +363,7 @@ show status like 'Row%'; show status like 'Handler%'; show status like '%tmp%'; drop table t1; +SET SESSION use_stat_tables = default; # # Test of handler status counts diff --git a/mysql-test/t/subselect_sj_mat.test b/mysql-test/t/subselect_sj_mat.test index d2bafa86028..19fc332e2af 100644 --- a/mysql-test/t/subselect_sj_mat.test +++ b/mysql-test/t/subselect_sj_mat.test @@ -1861,6 +1861,11 @@ drop table t1; --echo # --echo # MDEV-7220: Materialization strategy is not used for REPLACE ... SELECT --echo # +let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`; +--disable_query_log +SET SESSION use_stat_tables=never; +--enable_query_log + create table t0(a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -1900,6 +1905,9 @@ select * from t1 where (a,b) in (select max(a),b from t2 group by b); show status where Variable_name like 'Handler_read%' or Variable_name like 'Handler_%write%'; drop table t0,t1,t2,t3; +--disable_query_log +eval SET SESSION use_stat_tables=$use_stat_tables_saved; +--enable_query_log --echo # --echo # MDEV-7971: Assertion `name != __null' failed in ACL_internal_schema_registry::lookup diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index a02dce34837..6e29761d0ba 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -2410,6 +2410,10 @@ USE test; # # Test that using a trigger will not open mysql.proc # +let $use_stat_tables_saved= `SELECT @@session.use_stat_tables`; +--disable_query_log +SET SESSION use_stat_tables=never; +--enable_query_log create table t1 (i int); create table t2 (i int); flush tables; @@ -2428,6 +2432,9 @@ show status like 'Opened_tables'; select * from t1; select * from t2; drop table t1,t2; +--disable_query_log +eval SET SESSION use_stat_tables=$use_stat_tables_saved; +--enable_query_log --echo End of 5.2 tests. diff --git a/sql/slave.h b/sql/slave.h index 7f412c1091c..7f508449955 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -41,7 +41,7 @@ #include "rpl_filter.h" #include "rpl_tblmap.h" -#define SLAVE_NET_TIMEOUT 3600 +#define SLAVE_NET_TIMEOUT 60 #define MAX_SLAVE_ERROR 2000 diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index a047823551b..47a0a3899a3 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -513,7 +513,7 @@ static Sys_var_enum Sys_binlog_format( "UDFs) or the UUID() function; for those, row-based binary logging is " "automatically used.", SESSION_VAR(binlog_format), CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT), - binlog_format_names, DEFAULT(BINLOG_FORMAT_STMT), + binlog_format_names, DEFAULT(BINLOG_FORMAT_MIXED), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_format_check), ON_UPDATE(fix_binlog_format_after_update)); @@ -1224,7 +1224,7 @@ static Sys_var_double Sys_long_query_time( "to execute to file. The argument will be treated as a decimal value " "with microsecond precision", SESSION_VAR(long_query_time_double), - CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(10), + CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, LONG_TIMEOUT), DEFAULT(2), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(update_cached_long_query_time)); @@ -1324,7 +1324,7 @@ static Sys_var_ulong Sys_max_allowed_packet( "max_allowed_packet", "Max packet length to send to or receive from the server", SESSION_VAR(max_allowed_packet), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1024, 1024*1024*1024), DEFAULT(4*1024*1024), + VALID_RANGE(1024, 1024*1024*1024), DEFAULT(16*1024*1024), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_max_allowed_packet)); @@ -3933,7 +3933,7 @@ static Sys_var_ulonglong Sys_group_concat_max_len( "group_concat_max_len", "The maximum length of the result of function GROUP_CONCAT()", SESSION_VAR(group_concat_max_len), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(4, SIZE_T_MAX), DEFAULT(1024), BLOCK_SIZE(1)); + VALID_RANGE(4, SIZE_T_MAX), DEFAULT(1024*1024), BLOCK_SIZE(1)); static char *glob_hostname_ptr; static Sys_var_charptr Sys_hostname( @@ -4595,7 +4595,7 @@ static Sys_var_uint Sys_sync_binlog_period( "sync_binlog", "Synchronously flush binary log to disk after " "every #th event. Use 0 (default) to disable synchronous flushing", GLOBAL_VAR(sync_binlog_period), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, UINT_MAX), DEFAULT(1), BLOCK_SIZE(1)); static Sys_var_uint Sys_sync_masterinfo_period( "sync_master_info", "Synchronously flush master info to disk " @@ -5184,7 +5184,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events( "Tells the master to annotate RBR events with the statement that " "caused these events", SESSION_VAR(binlog_annotate_row_events), CMD_LINE(OPT_ARG), - DEFAULT(FALSE)); + DEFAULT(TRUE)); #ifdef HAVE_REPLICATION static Sys_var_mybool Sys_replicate_annotate_row_events( @@ -5192,7 +5192,7 @@ static Sys_var_mybool Sys_replicate_annotate_row_events( "Tells the slave to write annotate rows events received from the master " "to its own binary log. Ignored if log_slave_updates is not set", READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events), - CMD_LINE(OPT_ARG), DEFAULT(0)); + CMD_LINE(OPT_ARG), DEFAULT(TRUE)); #endif static Sys_var_ulonglong Sys_join_buffer_space_limit( @@ -5215,14 +5215,14 @@ static Sys_var_enum Sys_optimizer_use_stat_tables( "use_stat_tables", "Specifies how to use system statistics tables", SESSION_VAR(use_stat_tables), CMD_LINE(REQUIRED_ARG), - use_stat_tables_modes, DEFAULT(0)); + use_stat_tables_modes, DEFAULT(1)); static Sys_var_ulong Sys_histogram_size( "histogram_size", "Number of bytes used for a histogram. " "If set to 0, no histograms are created by ANALYZE.", SESSION_VAR(histogram_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(0, 255), DEFAULT(0), BLOCK_SIZE(1)); + VALID_RANGE(0, 255), DEFAULT(255), BLOCK_SIZE(1)); extern const char *histogram_types[]; static Sys_var_enum Sys_histogram_type( diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 604adfadae3..27e7537662b 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -218,6 +218,11 @@ set by user, however, it will be adjusted to the newer file format if a table of such format is created/opened. */ static char* innobase_file_format_max = NULL; +/** Default value of innodb_file_format */ +static const char* innodb_file_format_default = "Barracuda"; +/** Default value of innodb_file_format_max */ +static const char* innodb_file_format_max_default = "Antelope"; + static char* innobase_file_flush_method = NULL; /* This variable can be set in the server configure file, specifying @@ -831,7 +836,7 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG, static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG, "Use strict mode when evaluating create options.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_THDVAR_BOOL(ft_enable_stopword, PLUGIN_VAR_OPCMDARG, "Create FTS index with stopword.", @@ -18640,7 +18645,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, "magic number when reading; " "Files updated when this option is set to crc32 or strict_crc32 will " "not be readable by MySQL versions older than 5.6.3", - NULL, NULL, SRV_CHECKSUM_ALGORITHM_INNODB, + NULL, NULL, SRV_CHECKSUM_ALGORITHM_CRC32, &innodb_checksum_algorithm_typelib); static MYSQL_SYSVAR_BOOL(checksums, innobase_use_checksums, @@ -18729,7 +18734,7 @@ static MYSQL_SYSVAR_ULONG(purge_threads, srv_n_purge_threads, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "Purge threads can be from 1 to 32. Default is 1.", NULL, NULL, - 1, /* Default setting */ + 4, /* Default setting */ 1, /* Minimum value */ 32, 0); /* Maximum value */ @@ -18756,7 +18761,7 @@ static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name, PLUGIN_VAR_RQCMDARG, "File format to use for new tables in .ibd files.", innodb_file_format_name_validate, - innodb_file_format_name_update, "Antelope"); + innodb_file_format_name_update, innodb_file_format_default); /* "innobase_file_format_check" decides whether we would continue booting the server if the file format stamped on the system @@ -18777,7 +18782,7 @@ static MYSQL_SYSVAR_STR(file_format_max, innobase_file_format_max, PLUGIN_VAR_OPCMDARG, "The highest file format in the tablespace.", innodb_file_format_max_validate, - innodb_file_format_max_update, "Antelope"); + innodb_file_format_max_update, innodb_file_format_max_default); static MYSQL_SYSVAR_STR(ft_server_stopword_table, innobase_server_stopword_table, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC, @@ -18812,7 +18817,7 @@ static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method, static MYSQL_SYSVAR_BOOL(large_prefix, innobase_large_prefix, PLUGIN_VAR_NOCMDARG, "Support large index prefix length of REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_BOOL(force_load_corrupted, srv_load_corrupted, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, @@ -18937,8 +18942,9 @@ static MYSQL_SYSVAR_ULONGLONG(stats_modified_counter, srv_stats_modified_counter static MYSQL_SYSVAR_BOOL(stats_traditional, srv_stats_sample_traditional, PLUGIN_VAR_RQCMDARG, - "Enable traditional statistic calculation based on number of configured pages (default true)", - NULL, NULL, TRUE); + "Enable traditional statistic calculation based on number of configured " + "pages (default false)", + NULL, NULL, FALSE); static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled, PLUGIN_VAR_OPCMDARG, @@ -18965,7 +18971,7 @@ static MYSQL_SYSVAR_BOOL(log_compressed_pages, page_zip_log_pages, " the zlib compression algorithm changes." " When turned OFF, InnoDB will assume that the zlib" " compression algorithm doesn't change.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_LONG(additional_mem_pool_size, innobase_additional_mem_pool_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, @@ -19015,12 +19021,12 @@ static MYSQL_SYSVAR_BOOL(buffer_pool_dump_now, innodb_buffer_pool_dump_now, static MYSQL_SYSVAR_BOOL(buffer_pool_dump_at_shutdown, srv_buffer_pool_dump_at_shutdown, PLUGIN_VAR_RQCMDARG, "Dump the buffer pool into a file named @@innodb_buffer_pool_filename", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_ULONG(buffer_pool_dump_pct, srv_buf_pool_dump_pct, PLUGIN_VAR_RQCMDARG, - "Dump only the hottest N% of each buffer pool, defaults to 100", - NULL, NULL, 100, 1, 100, 0); + "Dump only the hottest N% of each buffer pool, defaults to 25", + NULL, NULL, 25, 1, 100, 0); #ifdef UNIV_DEBUG static MYSQL_SYSVAR_STR(buffer_pool_evict, srv_buffer_pool_evict, @@ -19043,7 +19049,7 @@ static MYSQL_SYSVAR_BOOL(buffer_pool_load_abort, innodb_buffer_pool_load_abort, static MYSQL_SYSVAR_BOOL(buffer_pool_load_at_startup, srv_buffer_pool_load_at_startup, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Load the buffer pool from a file named @@innodb_buffer_pool_filename", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_BOOL(defragment, srv_defragment, PLUGIN_VAR_RQCMDARG, @@ -19230,7 +19236,7 @@ static MYSQL_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size, static MYSQL_SYSVAR_LONGLONG(log_file_size, innobase_log_file_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Size of each log file in a log group.", - NULL, NULL, 48*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L); + NULL, NULL, 128*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L); static MYSQL_SYSVAR_ULONG(log_files_in_group, srv_n_log_files, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 844e8627939..f92f7addae6 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -257,7 +257,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_file_hash_size, pagecache_file_hash_size, static MYSQL_SYSVAR_SET(recover_options, maria_recover_options, PLUGIN_VAR_OPCMDARG, "Specifies how corrupted tables should be automatically repaired", - NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib); + NULL, NULL, HA_RECOVER_BACKUP|HA_RECOVER_FORCE, &maria_recover_typelib); static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG, "Number of threads to use when repairing Aria tables. The value of 1 " diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 9df1ec832a8..3c8ecea36c6 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -67,7 +67,7 @@ static MYSQL_SYSVAR_ULONGLONG(max_sort_file_size, myisam_max_temp_length, static MYSQL_SYSVAR_SET(recover_options, myisam_recover_options, PLUGIN_VAR_OPCMDARG|PLUGIN_VAR_READONLY, "Specifies how corrupted tables should be automatically repaired", - NULL, NULL, 1, &myisam_recover_typelib); + NULL, NULL, HA_RECOVER_BACKUP|HA_RECOVER_FORCE, &myisam_recover_typelib); static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG, "If larger than 1, when repairing a MyISAM table all indexes will be " diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 292d498ebfb..2656610a2a3 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -220,6 +220,11 @@ set by user, however, it will be adjusted to the newer file format if a table of such format is created/opened. */ static char* innobase_file_format_max = NULL; +/** Default value of innodb_file_format */ +static const char* innodb_file_format_default = "Barracuda"; +/** Default value of innodb_file_format_max */ +static const char* innodb_file_format_max_default = "Antelope"; + static char* innobase_file_flush_method = NULL; /* This variable can be set in the server configure file, specifying @@ -923,7 +928,7 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG, static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG, "Use strict mode when evaluating create options.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_THDVAR_BOOL(ft_enable_stopword, PLUGIN_VAR_OPCMDARG, "Create FTS index with stopword.", @@ -19851,7 +19856,7 @@ static MYSQL_SYSVAR_ENUM(checksum_algorithm, srv_checksum_algorithm, "magic number when reading; " "Files updated when this option is set to crc32 or strict_crc32 will " "not be readable by MySQL versions older than 5.6.3", - NULL, NULL, SRV_CHECKSUM_ALGORITHM_INNODB, + NULL, NULL, SRV_CHECKSUM_ALGORITHM_CRC32, &innodb_checksum_algorithm_typelib); @@ -19978,7 +19983,7 @@ static MYSQL_SYSVAR_ULONG(purge_threads, srv_n_purge_threads, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY, "Purge threads can be from 1 to 32. Default is 1.", NULL, NULL, - 1, /* Default setting */ + 4, /* Default setting */ 1, /* Minimum value */ SRV_MAX_N_PURGE_THREADS, 0); /* Maximum value */ @@ -20005,7 +20010,7 @@ static MYSQL_SYSVAR_STR(file_format, innobase_file_format_name, PLUGIN_VAR_RQCMDARG, "File format to use for new tables in .ibd files.", innodb_file_format_name_validate, - innodb_file_format_name_update, "Antelope"); + innodb_file_format_name_update, innodb_file_format_default); /* "innobase_file_format_check" decides whether we would continue booting the server if the file format stamped on the system @@ -20026,7 +20031,7 @@ static MYSQL_SYSVAR_STR(file_format_max, innobase_file_format_max, PLUGIN_VAR_OPCMDARG, "The highest file format in the tablespace.", innodb_file_format_max_validate, - innodb_file_format_max_update, "Antelope"); + innodb_file_format_max_update, innodb_file_format_max_default); static MYSQL_SYSVAR_STR(ft_server_stopword_table, innobase_server_stopword_table, PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_MEMALLOC, @@ -20060,7 +20065,7 @@ static MYSQL_SYSVAR_STR(flush_method, innobase_file_flush_method, static MYSQL_SYSVAR_BOOL(large_prefix, innobase_large_prefix, PLUGIN_VAR_NOCMDARG, "Support large index prefix length of REC_VERSION_56_MAX_INDEX_COL_LEN (3072) bytes.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_BOOL(force_load_corrupted, srv_load_corrupted, PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY, @@ -20201,8 +20206,9 @@ static MYSQL_SYSVAR_ULONGLONG(stats_modified_counter, srv_stats_modified_counter static MYSQL_SYSVAR_BOOL(stats_traditional, srv_stats_sample_traditional, PLUGIN_VAR_RQCMDARG, - "Enable traditional statistic calculation based on number of configured pages (default true)", - NULL, NULL, TRUE); + "Enable traditional statistic calculation based on number of configured " + "pages (default false)", + NULL, NULL, FALSE); static MYSQL_SYSVAR_BOOL(adaptive_hash_index, btr_search_enabled, PLUGIN_VAR_OPCMDARG, @@ -20231,7 +20237,7 @@ static MYSQL_SYSVAR_BOOL(log_compressed_pages, page_zip_log_pages, " the zlib compression algorithm changes." " When turned OFF, InnoDB will assume that the zlib" " compression algorithm doesn't change.", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_LONG(additional_mem_pool_size, innobase_additional_mem_pool_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, @@ -20399,12 +20405,12 @@ static MYSQL_SYSVAR_BOOL(buffer_pool_dump_now, innodb_buffer_pool_dump_now, static MYSQL_SYSVAR_BOOL(buffer_pool_dump_at_shutdown, srv_buffer_pool_dump_at_shutdown, PLUGIN_VAR_RQCMDARG, "Dump the buffer pool into a file named @@innodb_buffer_pool_filename", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_ULONG(buffer_pool_dump_pct, srv_buf_pool_dump_pct, PLUGIN_VAR_RQCMDARG, - "Dump only the hottest N% of each buffer pool, defaults to 100", - NULL, NULL, 100, 1, 100, 0); + "Dump only the hottest N% of each buffer pool, defaults to 25", + NULL, NULL, 25, 1, 100, 0); #ifdef UNIV_DEBUG static MYSQL_SYSVAR_STR(buffer_pool_evict, srv_buffer_pool_evict, @@ -20427,7 +20433,7 @@ static MYSQL_SYSVAR_BOOL(buffer_pool_load_abort, innodb_buffer_pool_load_abort, static MYSQL_SYSVAR_BOOL(buffer_pool_load_at_startup, srv_buffer_pool_load_at_startup, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Load the buffer pool from a file named @@innodb_buffer_pool_filename", - NULL, NULL, FALSE); + NULL, NULL, TRUE); static MYSQL_SYSVAR_BOOL(defragment, srv_defragment, PLUGIN_VAR_RQCMDARG, @@ -20622,7 +20628,7 @@ static MYSQL_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size, static MYSQL_SYSVAR_LONGLONG(log_file_size, innobase_log_file_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, "Size of each log file in a log group.", - NULL, NULL, 48*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L); + NULL, NULL, 128*1024*1024L, 1*1024*1024L, LONGLONG_MAX, 1024*1024L); static MYSQL_SYSVAR_ULONG(log_files_in_group, srv_n_log_files, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, |