executor: fix INSERT IGNORE + STRICT Mode + DST transition. (#61440) (#62304)

close #61439

Author: ti-chi-bot

pkg/executor/insert_common.go

@@ -325,7 +325,8 @@ func (e *InsertValues) handleErr(col *table.Column, val *types.Datum, rowIdx int
 	if col != nil && col.GetType() == mysql.TypeTimestamp &&
 		types.ErrTimestampInDSTTransition.Equal(err) {
 		newErr := exeerrors.ErrTruncateWrongInsertValue.FastGenByArgs(types.TypeStr(col.GetType()), val.GetString(), col.Name.O, rowIdx+1)
-		if e.Ctx().GetSessionVars().SQLMode.HasStrictMode() {
+		// IGNORE takes precedence over STRICT mode.
+		if !e.ignoreErr && e.Ctx().GetSessionVars().SQLMode.HasStrictMode() {
 			return newErr
 		}
 		// timestamp already adjusted to end of DST transition, convert error to warning

tests/integrationtest/r/executor/insert.result

@@ -2380,3 +2380,22 @@ id	ts	mode
 DROP TABLE t;
 SET @@time_zone = @old_time_zone;
 SET @@sql_mode = @old_sql_mode;
+SET @old_time_zone = @@time_zone;
+SET @@time_zone = 'Europe/Amsterdam';
+SET @old_sql_mode = @@sql_mode;
+create table t (ts timestamp);
+set time_zone = 'Europe/Amsterdam';
+set sql_mode = 'strict_trans_tables,no_zero_date,no_zero_in_date,error_for_division_by_zero';
+insert into t values ('2025-03-30 02:00:00');
+Error 1292 (22007): Incorrect timestamp value: '2025-03-30 02:00:00' for column 'ts' at row 1
+select * from t;
+ts
+insert ignore into t values ('2025-03-30 02:00:00');
+Level	Code	Message
+Warning	1292	Incorrect timestamp value: '2025-03-30 02:00:00' for column 'ts' at row 1
+select * from t;
+ts
+2025-03-30 03:00:00
+DROP TABLE t;
+SET @@time_zone = @old_time_zone;
+SET @@sql_mode = @old_sql_mode;

tests/integrationtest/t/executor/insert.test

@@ -1732,4 +1732,20 @@ SELECT * FROM t ORDER BY id;
 DROP TABLE t;
 SET @@time_zone = @old_time_zone;
 SET @@sql_mode = @old_sql_mode;
+
+# Testing INSERT IGNORE with STRICT mode, #61439
+SET @old_time_zone = @@time_zone;
+SET @@time_zone = 'Europe/Amsterdam';
+SET @old_sql_mode = @@sql_mode;
+create table t (ts timestamp);
+set time_zone = 'Europe/Amsterdam';
+set sql_mode = 'strict_trans_tables,no_zero_date,no_zero_in_date,error_for_division_by_zero';
+--error 1292
+insert into t values ('2025-03-30 02:00:00');
+select * from t;
+insert ignore into t values ('2025-03-30 02:00:00');
+select * from t;
+DROP TABLE t;
+SET @@time_zone = @old_time_zone;
+SET @@sql_mode = @old_sql_mode;
 --disable_warnings