Merge 10.6 into 10.7

2 files changed, 41 insertions, 0 deletions

diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result
index e07f1408ab7..0cdc5945acf 100644
--- a/mysql-test/suite/versioning/r/alter.result
+++ b/mysql-test/suite/versioning/r/alter.result
@@ -763,6 +763,25 @@ set system_versioning_alter_history= keep;
 alter ignore table t1 drop pk;
 drop table t1;
 #
+# MDEV-22660 SIGSEGV on adding system versioning and modifying system column
+#
+create or replace table t1 (a int);
+alter table t1
+add row_start timestamp(6) as row start,
+add row_end timestamp(6) as row end,
+add period for system_time(row_start, row_end),
+with system versioning,
+modify row_end varchar(8);
+ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `row_start` and `row_end`
+alter table t1
+add row_start timestamp(6) as row start,
+add row_end timestamp(6) as row end,
+add period for system_time(row_start, row_end),
+with system versioning,
+modify row_start varchar(8);
+ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `row_start` and `row_end`
+drop table t1;
+#
 # MDEV-21941 RENAME doesn't work for system time or period fields
 #
 create or replace table t1 (a int) with system versioning;
diff --git a/mysql-test/suite/versioning/t/alter.test b/mysql-test/suite/versioning/t/alter.test
index 53f0537ff92..0ec2f887950 100644
--- a/mysql-test/suite/versioning/t/alter.test
+++ b/mysql-test/suite/versioning/t/alter.test
@@ -658,6 +658,28 @@ drop table t1;
 
 
 --echo #
+--echo # MDEV-22660 SIGSEGV on adding system versioning and modifying system column
+--echo #
+create or replace table t1 (a int);
+--error ER_VERS_PERIOD_COLUMNS
+alter table t1
+  add row_start timestamp(6) as row start,
+  add row_end timestamp(6) as row end,
+  add period for system_time(row_start, row_end),
+  with system versioning,
+  modify row_end varchar(8);
+--error ER_VERS_PERIOD_COLUMNS
+alter table t1
+  add row_start timestamp(6) as row start,
+  add row_end timestamp(6) as row end,
+  add period for system_time(row_start, row_end),
+  with system versioning,
+  modify row_start varchar(8);
+# cleanup
+drop table t1;
+
+
+--echo #
 --echo # MDEV-21941 RENAME doesn't work for system time or period fields
 --echo #
 create or replace table t1 (a int) with system versioning;