Merge branch 'release-6.1' of github.com:pingcap/tidb into cherry-pic…

…k-41610-to-release-6.1

ddl/column.go

@@ -658,7 +658,8 @@ func needChangeColumnData(oldCol, newCol *model.ColumnInfo) bool {
 	toUnsigned := mysql.HasUnsignedFlag(newCol.GetFlag())
 	originUnsigned := mysql.HasUnsignedFlag(oldCol.GetFlag())
 	needTruncationOrToggleSign := func() bool {
-		return (newCol.GetFlen() > 0 && newCol.GetFlen() < oldCol.GetFlen()) || (toUnsigned != originUnsigned)
+		return (newCol.GetFlen() > 0 && (newCol.GetFlen() < oldCol.GetFlen() || newCol.GetDecimal() < oldCol.GetDecimal())) ||
+			(toUnsigned != originUnsigned)
 	}
 	// Ignore the potential max display length represented by integer's flen, use default flen instead.
 	defaultOldColFlen, _ := mysql.GetDefaultFieldLengthAndDecimal(oldCol.GetType())

ddl/column_type_change_test.go

@@ -2366,11 +2366,15 @@ func TestColumnTypeChangeBetweenFloatAndDouble(t *testing.T) {
 	prepare := func(createTableStmt string) {
 		tk.MustExec("drop table if exists t;")
 		tk.MustExec(createTableStmt)
-		tk.MustExec("insert into t values (36.4), (24.1);")
+		tk.MustExec("insert into t values (36.43), (24.1);")
 	}
 
 	prepare("create table t (a float(6,2));")
 	tk.MustExec("alter table t modify a double(6,2)")
+	tk.MustQuery("select a from t;").Check(testkit.Rows("36.43", "24.1"))
+
+	prepare("create table t (a float(6,2));")
+	tk.MustExec("alter table t modify a float(6,1)")
 	tk.MustQuery("select a from t;").Check(testkit.Rows("36.4", "24.1"))
 
 	prepare("create table t (a double(6,2));")

executor/explainfor_test.go

@@ -949,7 +949,7 @@ func TestIndexMerge4PlanCache(t *testing.T) {
 	tk.MustExec("set @a=9, @b=10, @c=11;")
 	tk.MustQuery("execute stmt using @a, @a;").Check(testkit.Rows("10 10 10"))
 	tk.MustQuery("execute stmt using @a, @c;").Check(testkit.Rows("10 10 10", "11 11 11"))
-	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("1"))
+	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("0")) // a>=9 and a<=9 --> a=9
 	tk.MustQuery("execute stmt using @c, @a;").Check(testkit.Rows("10 10 10"))
 	tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("1"))
 

executor/grant.go

@@ -444,6 +444,9 @@ func (e *GrantExec) grantLevelPriv(priv *ast.PrivElem, user *ast.UserSpec, inter
 	if priv.Priv == mysql.ExtendedPriv {
 		return e.grantDynamicPriv(priv.Name, user, internalSession)
 	}
+	if priv.Priv == mysql.UsagePriv {
+		return nil
+	}
 	switch e.Level.Level {
 	case ast.GrantLevelGlobal:
 		return e.grantGlobalLevel(priv, user, internalSession)
@@ -481,10 +484,6 @@ func (e *GrantExec) grantDynamicPriv(privName string, user *ast.UserSpec, intern
 
 // grantGlobalLevel manipulates mysql.user table.
 func (e *GrantExec) grantGlobalLevel(priv *ast.PrivElem, user *ast.UserSpec, internalSession sessionctx.Context) error {
-	if priv.Priv == 0 || priv.Priv == mysql.UsagePriv {
-		return nil
-	}
-
 	sql := new(strings.Builder)
 	sqlexec.MustFormatSQL(sql, `UPDATE %n.%n SET `, mysql.SystemDB, mysql.UserTable)
 	err := composeGlobalPrivUpdate(sql, priv.Priv, "Y")
@@ -499,9 +498,6 @@ func (e *GrantExec) grantGlobalLevel(priv *ast.PrivElem, user *ast.UserSpec, int
 
 // grantDBLevel manipulates mysql.db table.
 func (e *GrantExec) grantDBLevel(priv *ast.PrivElem, user *ast.UserSpec, internalSession sessionctx.Context) error {
-	if priv.Priv == mysql.UsagePriv {
-		return nil
-	}
 	for _, v := range mysql.StaticGlobalOnlyPrivs {
 		if v == priv.Priv {
 			return ErrWrongUsage.GenWithStackByArgs("DB GRANT", "GLOBAL PRIVILEGES")
@@ -534,9 +530,6 @@ func (e *GrantExec) grantDBLevel(priv *ast.PrivElem, user *ast.UserSpec, interna
 
 // grantTableLevel manipulates mysql.tables_priv table.
 func (e *GrantExec) grantTableLevel(priv *ast.PrivElem, user *ast.UserSpec, internalSession sessionctx.Context) error {
-	if priv.Priv == mysql.UsagePriv {
-		return nil
-	}
 	dbName := e.Level.DBName
 	if len(dbName) == 0 {
 		dbName = e.ctx.GetSessionVars().CurrentDB

executor/index_advise_test.go

@@ -69,3 +69,136 @@ func TestIndexAdvise(t *testing.T) {
 	require.Equal(t, uint64(4), ia.MaxIndexNum.PerTable)
 	require.Equal(t, uint64(5), ia.MaxIndexNum.PerDB)
 }
+
+func TestIndexJoinProjPattern(t *testing.T) {
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec(`create table t1(
+pnbrn_cnaps varchar(5) not null,
+new_accno varchar(18) not null,
+primary key(pnbrn_cnaps,new_accno) nonclustered
+);`)
+	tk.MustExec(`create table t2(
+pnbrn_cnaps varchar(5) not null,
+txn_accno varchar(18) not null,
+txn_dt date not null,
+yn_frz varchar(1) default null
+);`)
+	tk.MustExec(`insert into t1(pnbrn_cnaps,new_accno) values ("40001","123")`)
+	tk.MustExec(`insert into t2(pnbrn_cnaps, txn_accno, txn_dt, yn_frz) values ("40001","123","20221201","0");`)
+
+	sql := `update
+/*+ inl_join(a) */
+t2 b,
+(
+select t1.pnbrn_cnaps,
+t1.new_accno
+from t1
+where t1.pnbrn_cnaps = '40001'
+) a
+set b.yn_frz = '1'
+where b.txn_dt = str_to_date('20221201', '%Y%m%d')
+and b.pnbrn_cnaps = a.pnbrn_cnaps
+and b.txn_accno = a.new_accno;`
+	rows := [][]interface{}{
+		{"Update_8"},
+		{"└─IndexJoin_13"},
+		{"  ├─TableReader_23(Build)"},
+		{"  │ └─Selection_22"},
+		{"  │   └─TableFullScan_21"},
+		{"  └─IndexReader_12(Probe)"},
+		{"    └─Selection_11"},
+		{"      └─IndexRangeScan_10"},
+	}
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='ON'")
+	tk.MustQuery("explain "+sql).CheckAt([]int{0}, rows)
+	rows = [][]interface{}{
+		{"Update_8"},
+		{"└─HashJoin_10"},
+		{"  ├─IndexReader_17(Build)"},
+		{"  │ └─IndexRangeScan_16"},
+		{"  └─TableReader_14(Probe)"},
+		{"    └─Selection_13"},
+		{"      └─TableFullScan_12"},
+	}
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='OFF'")
+	tk.MustQuery("explain "+sql).CheckAt([]int{0}, rows)
+
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='ON'")
+	tk.MustExec(sql)
+	tk.MustQuery("select yn_frz from t2").Check(testkit.Rows("1"))
+}
+
+func TestIndexJoinSelPattern(t *testing.T) {
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec(` create table tbl_miss(
+id bigint(20) unsigned not null
+,txn_dt date default null
+,perip_sys_uuid varchar(32) not null
+,rvrs_idr varchar(1) not null
+,primary key(id) clustered
+,key idx1 (txn_dt, perip_sys_uuid, rvrs_idr)
+);
+`)
+	tk.MustExec(`insert into tbl_miss (id,txn_dt,perip_sys_uuid,rvrs_idr) values (1,"20221201","123","1");`)
+	tk.MustExec(`create table tbl_src(
+txn_dt date default null
+,uuid varchar(32) not null
+,rvrs_idr char(1)
+,expd_inf varchar(5000)
+,primary key(uuid,rvrs_idr) nonclustered
+);
+`)
+	tk.MustExec(`insert into tbl_src (txn_dt,uuid,rvrs_idr) values ("20221201","123","1");`)
+	sql := `select /*+ use_index(mis,) inl_join(src) */
+    *
+ from tbl_miss mis
+     ,tbl_src src
+ where src.txn_dt >= str_to_date('20221201', '%Y%m%d')
+ and mis.id between 1 and 10000
+ and mis.perip_sys_uuid = src.uuid
+ and mis.rvrs_idr = src.rvrs_idr
+ and mis.txn_dt = src.txn_dt
+ and (
+     case when isnull(src.expd_inf) = 1 then ''
+     else
+         substr(concat_ws('',src.expd_inf,'~~'),
+             instr(concat_ws('',src.expd_inf,'~~'),'~~a4') + 4,
+             instr(substr(concat_ws('',src.expd_inf,'~~'),
+                 instr(concat_ws('',src.expd_inf,'~~'),'~~a4') + 4, length(concat_ws('',src.expd_inf,'~~'))),'~~') -1)
+     end
+ ) != '01';`
+	rows := [][]interface{}{
+		{"HashJoin_9"},
+		{"├─TableReader_12(Build)"},
+		{"│ └─Selection_11"},
+		{"│   └─TableRangeScan_10"},
+		{"└─Selection_13(Probe)"},
+		{"  └─TableReader_16"},
+		{"    └─Selection_15"},
+		{"      └─TableFullScan_14"},
+	}
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='OFF'")
+	tk.MustQuery("explain "+sql).CheckAt([]int{0}, rows)
+	rows = [][]interface{}{
+		{"IndexJoin_12"},
+		{"├─TableReader_23(Build)"},
+		{"│ └─Selection_22"},
+		{"│   └─TableRangeScan_21"},
+		{"└─IndexLookUp_11(Probe)"},
+		{"  ├─IndexRangeScan_8(Build)"},
+		{"  └─Selection_10(Probe)"},
+		{"    └─TableRowIDScan_9"},
+	}
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='ON'")
+	tk.MustQuery("explain "+sql).CheckAt([]int{0}, rows)
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='ON'")
+	tk.MustQuery(sql).Check(testkit.Rows("1 2022-12-01 123 1 2022-12-01 123 1 <nil>"))
+	tk.MustExec("set @@session.tidb_enable_inl_join_inner_multi_pattern='OFF'")
+	tk.MustQuery(sql).Check(testkit.Rows("1 2022-12-01 123 1 2022-12-01 123 1 <nil>"))
+}