Merge branch 'master' into monitor_for_planCacheMemUsage

cmd/explaintest/r/access_path_selection.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `access_path_selection` (
 `a` int,
 `b` int,

cmd/explaintest/r/agg_predicate_pushdown.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop database if exists agg_predicate_pushdown;
 create database agg_predicate_pushdown;
 create table t(a int, b int, c int);

cmd/explaintest/r/black_list.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t (a int);

cmd/explaintest/r/clustered_index.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@tidb_enable_outer_join_reorder=true;
 drop database if exists with_cluster_index;
 create database with_cluster_index;

cmd/explaintest/r/collation_agg_func_disabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_agg_func;
 use collation_agg_func;
 create table t(id int, value varchar(20) charset utf8mb4 collate utf8mb4_general_ci, value1 varchar(20) charset utf8mb4 collate utf8mb4_bin);

cmd/explaintest/r/collation_agg_func_enabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_agg_func;
 use collation_agg_func;
 create table t(id int, value varchar(20) charset utf8mb4 collate utf8mb4_general_ci, value1 varchar(20) charset utf8mb4 collate utf8mb4_bin);

cmd/explaintest/r/collation_check_use_collation_disabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_check_use_collation;
 use collation_check_use_collation;
 CREATE TABLE `t` (

cmd/explaintest/r/collation_check_use_collation_enabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_check_use_collation;
 use collation_check_use_collation;
 CREATE TABLE `t` (

cmd/explaintest/r/collation_misc_disabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_misc;
 use collation_misc;
 create table t1(a varchar(20) charset utf8);

cmd/explaintest/r/collation_misc_enabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_misc;
 use collation_misc;
 create table t1(a varchar(20) charset utf8);

cmd/explaintest/r/collation_pointget_disabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_point_get;
 use collation_point_get;
 drop table if exists t;

cmd/explaintest/r/collation_pointget_enabled.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 create database collation_point_get;
 use collation_point_get;
 drop table if exists t;

cmd/explaintest/r/common_collation.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t(a char(10) collate utf8mb4_unicode_ci, b char(10) collate utf8mb4_general_ci);
 insert into t values ('啊', '撒旦');

cmd/explaintest/r/cte.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists tbl_0;
 create table tbl_0(a int);

cmd/explaintest/r/explain-non-select-stmt.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t(a bigint, b bigint);

cmd/explaintest/r/explain.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (id int, c1 timestamp);
 show columns from t;

cmd/explaintest/r/explain_complex.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `dt` (
 `id` int(11) unsigned NOT NULL AUTO_INCREMENT ,
 `aid` varchar(32) NOT NULL,

cmd/explaintest/r/explain_complex_stats.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists dt;
 CREATE TABLE dt (
 id int(11) unsigned NOT NULL,

cmd/explaintest/r/explain_cte.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2;
 create table t1 (c1 int primary key, c2 int, index c2 (c2));

cmd/explaintest/r/explain_easy.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2, t3, t4;
 create table t1 (c1 int primary key, c2 int, c3 int, index c2 (c2));

cmd/explaintest/r/explain_easy_stats.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2, t3;
 create table t1 (c1 int primary key, c2 int, c3 int, index c2 (c2));

cmd/explaintest/r/explain_generate_column_substitute.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set names utf8mb4;
 use test;
 drop table if exists t;

cmd/explaintest/r/explain_indexmerge.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (a int primary key, b int, c int, d int, e int, f int);
 create index tb on t (b);

cmd/explaintest/r/explain_join_stats.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists e, lo;
 create table e(a int, b int, key idx_a(a), key idx_b(b)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

cmd/explaintest/r/explain_shard_index.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists test3, test5;
 create table test3(id int primary key clustered, a int, b int, unique key uk_expr((tidb_shard(a)),a));

cmd/explaintest/r/explain_stats.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (id int, c1 timestamp);
 load stats 's/explain_stats_t.json';

cmd/explaintest/r/explain_union_scan.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists city;
 CREATE TABLE `city` (
 `id` varchar(70) NOT NULL,

cmd/explaintest/r/generated_columns.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 DROP TABLE IF EXISTS person;
 CREATE TABLE person (
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,

cmd/explaintest/r/imdbload.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE DATABASE IF NOT EXISTS `imdbload`;
 USE `imdbload`;
 CREATE TABLE `kind_type` (

cmd/explaintest/r/index_join.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2;
 create table t1(a bigint, b bigint, index idx(a));

cmd/explaintest/r/index_merge.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 ///// SUBQUERY
 drop table if exists t1;
 create table t1(c1 int, c2 int, c3 int, key(c1), key(c2));

cmd/explaintest/r/naaj.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 set @@session.tidb_enable_null_aware_anti_join=1;
 select "***************************************************** PART 1 *****************************************************************" as name;

cmd/explaintest/r/new_character_set.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 set names utf8mb4;
 create table t (a varchar(255) charset utf8mb4);

cmd/explaintest/r/new_character_set_builtin.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set names utf8mb4;
 set @@sql_mode = '';
 drop table if exists t;

cmd/explaintest/r/new_character_set_invalid.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@sql_mode = 'strict_trans_tables';
 drop table if exists t;
 create table t (a varchar(255) charset gbk, b varchar(255) charset ascii, c varchar(255) charset utf8);

cmd/explaintest/r/select.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@tidb_enable_outer_join_reorder=true;
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (

cmd/explaintest/r/show.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 show tables like '%xx';
 Tables_in_test (%xx)
 show databases like '%xx';

cmd/explaintest/r/subquery.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t1;
 drop table if exists t2;
 create table t1(a bigint, b bigint);

cmd/explaintest/r/topn_push_down.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `tr` (
 `id` bigint(20) NOT NULL,
 `biz_date` date NOT NULL,

cmd/explaintest/r/topn_pushdown.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 explain format = 'brief' select * from ((select 4 as a) union all (select 33 as a)) tmp order by a desc limit 1;
 id	estRows	task	access object	operator info
 TopN	1.00	root		Column#3:desc, offset:0, count:1

cmd/explaintest/r/tpch.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE DATABASE IF NOT EXISTS TPCH;
 USE TPCH;
 CREATE TABLE IF NOT EXISTS nation  ( N_NATIONKEY  INTEGER NOT NULL,

cmd/explaintest/r/vitess_hash.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t(

cmd/explaintest/r/window_function.result

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t (a int, b int, c timestamp, index idx(a));

cmd/explaintest/t/access_path_selection.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `access_path_selection` (
 `a` int,
 `b` int,

cmd/explaintest/t/agg_predicate_pushdown.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop database if exists agg_predicate_pushdown;
 create database agg_predicate_pushdown;
 

cmd/explaintest/t/black_list.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t (a int);

cmd/explaintest/t/clustered_index.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@tidb_enable_outer_join_reorder=true;
 drop database if exists with_cluster_index;
 create database with_cluster_index;

cmd/explaintest/t/collation_agg_func.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # These tests test the aggregate function's behavior according to collation.
 # The result of min/max of enum/set is wrong, please fix them soon.
 

cmd/explaintest/t/collation_check_use_collation.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # These tests check that the used collation is correct.
 
 # prepare database

cmd/explaintest/t/collation_misc.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # prepare database
 create database collation_misc;
 use collation_misc;

cmd/explaintest/t/collation_pointget.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # prepare database
 create database collation_point_get;
 use collation_point_get;

cmd/explaintest/t/common_collation.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 --disable_warnings
 drop table if exists t;
 --enable_warnings

cmd/explaintest/t/cte.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 # case 1
 drop table if exists tbl_0;

cmd/explaintest/t/explain-non-select-stmt.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t;
 create table t(a bigint, b bigint);

cmd/explaintest/t/explain.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (id int, c1 timestamp);
 show columns from t;

cmd/explaintest/t/explain_complex.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `dt` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT ,
   `aid` varchar(32) NOT NULL,

cmd/explaintest/t/explain_complex_stats.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists dt;
 CREATE TABLE dt (
   id int(11) unsigned NOT NULL,

cmd/explaintest/t/explain_cte.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2;
 create table t1 (c1 int primary key, c2 int, index c2 (c2));

cmd/explaintest/t/explain_easy.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2, t3, t4;
 create table t1 (c1 int primary key, c2 int, c3 int, index c2 (c2));

cmd/explaintest/t/explain_easy_stats.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2, t3;
 create table t1 (c1 int primary key, c2 int, c3 int, index c2 (c2));

cmd/explaintest/t/explain_generate_column_substitute.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set names utf8mb4;
 use test;
 drop table if exists t;

cmd/explaintest/t/explain_indexmerge.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (a int primary key, b int, c int, d int, e int, f int);
 create index tb on t (b);

cmd/explaintest/t/explain_join_stats.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists e, lo;
 create table e(a int, b int, key idx_a(a), key idx_b(b)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

cmd/explaintest/t/explain_shard_index.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists test3, test5;
 create table test3(id int primary key clustered, a int, b int, unique key uk_expr((tidb_shard(a)),a));

cmd/explaintest/t/explain_stats.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t;
 create table t (id int, c1 timestamp);
 load stats 's/explain_stats_t.json';

cmd/explaintest/t/explain_union_scan.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists city;
 
 CREATE TABLE `city` (

cmd/explaintest/t/generated_columns.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 -- Tests of using stored generated column as index and partition column.
 -- Most of the cases are ported from other tests to make sure generated columns behaves the same.
 

cmd/explaintest/t/imdbload.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE DATABASE IF NOT EXISTS `imdbload`;
 USE `imdbload`;
 -- The table schema is converted from imdb dataset using IMDbPY

cmd/explaintest/t/index_join.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 use test;
 drop table if exists t1, t2;
 create table t1(a bigint, b bigint, index idx(a));

cmd/explaintest/t/index_merge.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 --echo ///// SUBQUERY
 drop table if exists t1;
 create table t1(c1 int, c2 int, c3 int, key(c1), key(c2));

cmd/explaintest/t/naaj.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # naaj.test file is for null-aware anti join
 use test;
 set @@session.tidb_enable_null_aware_anti_join=1;

cmd/explaintest/t/new_character_set.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 -- @@character_set_results = 'gbk', TiDB transforms row value into GBK charset.
 drop table if exists t;
 set names utf8mb4;

cmd/explaintest/t/new_character_set_builtin.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set names utf8mb4;
 set @@sql_mode = '';
 -- test for builtin function hex(), length(), ascii(), octet_length()

cmd/explaintest/t/new_character_set_invalid.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@sql_mode = 'strict_trans_tables';
 drop table if exists t;
 create table t (a varchar(255) charset gbk, b varchar(255) charset ascii, c varchar(255) charset utf8);

cmd/explaintest/t/select.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 set @@tidb_enable_outer_join_reorder=true;
 DROP TABLE IF EXISTS t;
 

cmd/explaintest/t/show.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 # test show output field name
 show tables like '%xx';
 show databases like '%xx';

cmd/explaintest/t/subquery.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 drop table if exists t1;
 drop table if exists t2;
 create table t1(a bigint, b bigint);

cmd/explaintest/t/topn_push_down.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 CREATE TABLE `tr` (
   `id` bigint(20) NOT NULL,
   `biz_date` date NOT NULL,

cmd/explaintest/t/topn_pushdown.test

@@ -1 +1,2 @@
+set tidb_cost_model_version=1;
 explain format = 'brief' select * from ((select 4 as a) union all (select 33 as a)) tmp order by a desc limit 1;

cmd/explaintest/t/tpch.test

@@ -1,3 +1,4 @@
+set tidb_cost_model_version=1;
 -- http://www.tpc.org/tpc_documents_current_versions/pdf/tpc-h_v2.17.1.pdf
 CREATE DATABASE IF NOT EXISTS TPCH;
 USE TPCH;