Merge branch 'master' into issue-28175

README.md

@@ -22,9 +22,9 @@ TiDB ("Ti" stands for Titanium) is an open-source NewSQL database that supports
 
     TiDB acts like it is a MySQL 5.7 server to your applications. You can continue to use all of the existing MySQL client libraries, and in many cases, you will not need to change a single line of code in your application. Because TiDB is built from scratch, not a MySQL fork, please check out the list of [known compatibility differences](https://docs.pingcap.com/tidb/stable/mysql-compatibility).
 
-- __Distributed Transactions with Strong Consistency__
+- __Distributed Transactions__
 
-    TiDB internally shards table into small range-based chunks that we refer to as "Regions". Each Region defaults to approximately 100 MiB in size, and TiDB uses a Two-phase commit internally to ensure that Regions are maintained in a transactionally consistent way.
+    TiDB internally shards table into small range-based chunks that we refer to as "Regions". Each Region defaults to approximately 100 MiB in size, and TiDB uses an [optimized](https://pingcap.com/blog/async-commit-the-accelerator-for-transaction-commit-in-tidb-5.0) Two-phase commit to ensure that Regions are maintained in a transactionally consistent way.
 
 - __Cloud Native__
 

executor/index_lookup_merge_join.go

@@ -689,7 +689,7 @@ func (imw *innerMergeWorker) constructDatumLookupKey(task *lookUpMergeJoinTask,
 		innerValue, err := outerValue.ConvertTo(sc, innerColType)
 		if err != nil {
 			// If the converted outerValue overflows, we don't need to lookup it.
-			if terror.ErrorEqual(err, types.ErrOverflow) {
+			if terror.ErrorEqual(err, types.ErrOverflow) || terror.ErrorEqual(err, types.ErrWarnDataOutOfRange) {
 				return nil, nil
 			}
 			if terror.ErrorEqual(err, types.ErrTruncated) && (innerColType.Tp == mysql.TypeSet || innerColType.Tp == mysql.TypeEnum) {

executor/index_lookup_merge_join_test.go

@@ -42,6 +42,22 @@ func (s *testSerialSuite) TestIndexLookupMergeJoinHang(c *C) {
 	c.Assert(err.Error(), Equals, "OOM test index merge join doesn't hang here.")
 }
 
+func (s *testSerialSuite) TestIssue28052(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t")
+	tk.MustExec("CREATE TABLE `t` (" +
+		"`col_tinyint_key_signed` tinyint(4) DEFAULT NULL," +
+		"`col_year_key_signed` year(4) DEFAULT NULL," +
+		"KEY `col_tinyint_key_signed` (`col_tinyint_key_signed`)," +
+		"KEY `col_year_key_signed` (`col_year_key_signed`)" +
+		" ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin")
+
+	tk.MustExec("insert into t values(-100,NULL);")
+	tk.MustQuery("select /*+ inl_merge_join(t1, t2) */ count(*) from t t1 right join t t2 on t1. `col_year_key_signed` = t2. `col_tinyint_key_signed`").Check(testkit.Rows("1"))
+}
+
 func (s *testSerialSuite) TestIssue18068(c *C) {
 	c.Assert(failpoint.Enable("github.com/pingcap/tidb/executor/testIssue18068", `return(true)`), IsNil)
 	defer func() {

store/store.go

@@ -17,6 +17,7 @@ package store
 import (
 	"net/url"
 	"strings"
+	"sync"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/kv"
@@ -26,9 +27,13 @@ import (
 )
 
 var stores = make(map[string]kv.Driver)
+var storesLock sync.RWMutex
 
 // Register registers a kv storage with unique name and its associated Driver.
 func Register(name string, driver kv.Driver) error {
+	storesLock.Lock()
+	defer storesLock.Unlock()
+
 	name = strings.ToLower(name)
 
 	if _, ok := stores[name]; ok {
@@ -59,7 +64,7 @@ func newStoreWithRetry(path string, maxRetries int) (kv.Storage, error) {
 	}
 
 	name := strings.ToLower(storeURL.Scheme)
-	d, ok := stores[name]
+	d, ok := loadDriver(name)
 	if !ok {
 		return nil, errors.Errorf("invalid uri format, storage %s is not registered", name)
 	}
@@ -78,3 +83,10 @@ func newStoreWithRetry(path string, maxRetries int) (kv.Storage, error) {
 	}
 	return s, errors.Trace(err)
 }
+
+func loadDriver(name string) (kv.Driver, bool) {
+	storesLock.RLock()
+	defer storesLock.RUnlock()
+	d, ok := stores[name]
+	return d, ok
+}