Adjust tests

mysql-test/suite/gcol/r/innodb_virtual_rebuild.result

@@ -8,30 +8,22 @@ INSERT INTO t4 SET i=1;
 ALTER TABLE t4 ADD INDEX(v), LOCK=NONE;
 ALTER TABLE t4 ADD COLUMN k INT, LOCK=NONE;
 ALTER TABLE t4 DROP k, LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED
 ALTER TABLE t4 DROP INDEX v, LOCK=NONE;
-ALTER TABLE t4 DROP k, LOCK=NONE;
 INSERT INTO t3 SET i=1;
 ALTER TABLE t3 ADD INDEX(v), LOCK=NONE;
 ALTER TABLE t3 ADD COLUMN k INT, LOCK=NONE;
 ALTER TABLE t3 DROP k, LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED
 ALTER TABLE t3 DROP INDEX v, LOCK=NONE;
-ALTER TABLE t3 DROP k, LOCK=NONE;
 INSERT INTO t2 SET i=1;
 ALTER TABLE t2 ADD INDEX(v), LOCK=NONE;
 ALTER TABLE t2 ADD COLUMN k INT, LOCK=NONE;
 ALTER TABLE t2 DROP k, LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED
 ALTER TABLE t2 DROP INDEX v, LOCK=NONE;
-ALTER TABLE t2 DROP k, LOCK=NONE;
 INSERT INTO t1 SET i=1;
 ALTER TABLE t1 ADD INDEX(v), LOCK=NONE;
 ALTER TABLE t1 ADD COLUMN k INT, LOCK=NONE;
 ALTER TABLE t1 DROP k, LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: online rebuild with indexed virtual columns. Try LOCK=SHARED
 ALTER TABLE t1 DROP INDEX v, LOCK=NONE;
-ALTER TABLE t1 DROP k, LOCK=NONE;
 connect  ddl,localhost,root,,test;
 connection default;
 connection ddl;

mysql-test/suite/gcol/t/innodb_virtual_rebuild.test

@@ -15,10 +15,8 @@ while ($n)
 eval INSERT INTO t$n SET i=1;
 eval ALTER TABLE t$n ADD INDEX(v), LOCK=NONE;
 eval ALTER TABLE t$n ADD COLUMN k INT, LOCK=NONE;
---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 eval ALTER TABLE t$n DROP k, LOCK=NONE;
 eval ALTER TABLE t$n DROP INDEX v, LOCK=NONE;
-eval ALTER TABLE t$n DROP k, LOCK=NONE;
 dec $n;
 }
 

mysql-test/suite/versioning/r/online.result

@@ -25,8 +25,7 @@ add s bigint unsigned as row start,
 add e bigint unsigned as row end,
 add period for system_time(s, e),
 add system versioning;
-alter table t drop column b, lock=none;
-ERROR 0A000: LOCK=NONE is not supported. Reason: Not implemented for system-versioned tables. Try LOCK=SHARED
+alter table t drop column b, algorithm=instant;
 alter table t add index idx(a), lock=none;
 alter table t drop column s, drop column e;
 alter table t drop system versioning, lock=none;

mysql-test/suite/versioning/t/online.test

@@ -32,8 +32,7 @@ alter table t
   add e bigint unsigned as row end,
   add period for system_time(s, e),
   add system versioning;
---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-alter table t drop column b, lock=none;
+alter table t drop column b, algorithm=instant;
 alter table t add index idx(a), lock=none;
 alter table t drop column s, drop column e;
 --error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON