This is an automated cherry-pick of pingcap#49207

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

errno/errname.go

@@ -1044,8 +1044,13 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
  ErrLoadParquetFromLocal: mysql.Message("Do not support loading parquet files from local. Please try to load the parquet files from the cloud storage", nil),
  ErrLoadDataEmptyPath: mysql.Message("The value of INFILE must not be empty when LOAD DATA from LOCAL", nil),
  ErrLoadDataUnsupportedFormat: mysql.Message("The FORMAT '%s' is not supported", nil),
+<<<<<<< HEAD:errno/errname.go
  ErrLoadDataInvalidURI: mysql.Message("The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'", nil),
  ErrLoadDataCantAccess: mysql.Message("Access to the source file has been denied. Reason: %s. Please check the URI, access key and secret access key are correct", nil),
+=======
+ ErrLoadDataInvalidURI: mysql.Message("The URI of %s is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access-key={your_access_key_id ID}&secret-access-key={your_secret_access_key}&session-token={your_session_token}'", nil),
+ ErrLoadDataCantAccess: mysql.Message("Access to the %s has been denied. Reason: %s. Please check the URI, access key and secret access key are correct", nil),
+>>>>>>> d932d907f80 (errmsg: fix example s3 url in error msg (#49207)):pkg/errno/errname.go
  ErrLoadDataCantRead: mysql.Message("Failed to read source files. Reason: %s. %s", nil),
  ErrLoadDataWrongFormatConfig: mysql.Message("", nil),
  ErrUnknownOption: mysql.Message("Unknown option %s", nil),

errors.toml

@@ -1733,7 +1733,11 @@ The FORMAT '%s' is not supported
 
 ["executor:8158"]
 error = '''
+<<<<<<< HEAD
 The URI of INFILE is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'
+=======
+The URI of %s is invalid. Reason: %s. Please provide a valid URI, such as 's3://import/test.csv?access-key={your_access_key_id ID}&secret-access-key={your_secret_access_key}&session-token={your_session_token}'
+>>>>>>> d932d907f80 (errmsg: fix example s3 url in error msg (#49207))
 '''
 
 ["executor:8159"]

executor/loadremotetest/error_test.go

@@ -54,7 +54,11 @@ func (s *mockGCSSuite) TestErrorMessage() {
  checkClientErrorMessage(s.T(), err, "ERROR 1054 (42S22): Unknown column 'wrong' in 'field list'")
  err = s.tk.ExecToErr("LOAD DATA INFILE 'abc://1' INTO TABLE t;")
  checkClientErrorMessage(s.T(), err,
+<<<<<<< HEAD:executor/loadremotetest/error_test.go
  "ERROR 8158 (HY000): The URI of INFILE is invalid. Reason: storage abc not support yet. Please provide a valid URI, such as 's3://import/test.csv?access_key_id={your_access_key_id ID}&secret_access_key={your_secret_access_key}&session_token={your_session_token}'")
+=======
+ "ERROR 8158 (HY000): The URI of data source is invalid. Reason: storage abc not support yet. Please provide a valid URI, such as")
+>>>>>>> d932d907f80 (errmsg: fix example s3 url in error msg (#49207)):pkg/executor/test/loadremotetest/error_test.go
  err = s.tk.ExecToErr("LOAD DATA INFILE 's3://no-network' INTO TABLE t;")
  checkClientErrorMessage(s.T(), err,
  "ERROR 8159 (HY000): Access to the source file has been denied. Reason: failed to get region of bucket no-network. Please check the URI, access key and secret access key are correct")