MDEV-35612 fix for system-versioning

only ignore fully invisible fields

Author: vuvova

mysql-test/main/partition_exchange.result

@@ -1353,3 +1353,11 @@ ERROR HY000: Tables have different definitions
 create or replace table tp (a int, b text, unique (b), unique(a, b));
 alter table t exchange partition p0 with table tp;
 drop table t, tp;
+create table t (a int, b int) with system versioning partition by list (a) (partition p0 values in (1,2));
+create table tp (a int, b int);
+alter table t exchange partition p0 with table tp;
+ERROR HY000: Tables have different definitions
+create or replace table tp (a int, b int) with system versioning;
+alter table t exchange partition p0 with table tp;
+drop table t, tp;
+# End of 10.5 tests

mysql-test/main/partition_exchange.test

@@ -594,9 +594,17 @@ create table t (a int, b text, unique (b), unique(a, b)) partition by list (a) (
 create table tp (a int, b text, c int invisible, unique (b), unique(a, b));
 --error ER_TABLES_DIFFERENT_METADATA
 alter table t exchange partition p0 with table tp;
-
 create or replace table tp (a int, b text, unique (b), unique(a, b));
 alter table t exchange partition p0 with table tp;
+drop table t, tp;
 
-# cleanup
+# same for system versioning:
+create table t (a int, b int) with system versioning partition by list (a) (partition p0 values in (1,2));
+create table tp (a int, b int); # without system versioning
+--error ER_TABLES_DIFFERENT_METADATA
+alter table t exchange partition p0 with table tp;
+create or replace table tp (a int, b int) with system versioning;
+alter table t exchange partition p0 with table tp;
 drop table t, tp;
+
+--echo # End of 10.5 tests

sql/sql_table.cc

@@ -7954,10 +7954,10 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info,
   /* Some very basic checks. */
   uint fields= table->s->fields;
 
-  /* There is no field count on system-invisible fields, count them. */
+  /* There is no field count on fully-invisible fields, count them. */
   for (Field **f_ptr= table->field; *f_ptr; f_ptr++)
   {
-    if ((*f_ptr)->invisible >= INVISIBLE_SYSTEM)
+    if ((*f_ptr)->invisible >= INVISIBLE_FULL)
       fields--;
   }