archive: open ARZ files in external_lock, not in rnd_init/index_initbb-10.1-rediscover

4 files changed, 5 insertions, 3 deletions

diff --git a/mysql-test/suite/archive/archive_debug.result b/mysql-test/suite/archive/archive_debug.result
index 7bc6a113217..164b6f5197c 100644
--- a/mysql-test/suite/archive/archive_debug.result
+++ b/mysql-test/suite/archive/archive_debug.result
@@ -7,6 +7,7 @@ INSERT INTO t1 VALUES(1);
 SET SESSION debug_dbug='d,simulate_archive_open_failure';
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
+test.t1	check	Error	Table 't1' is marked as crashed and should be repaired
 test.t1	check	error	Corrupt
 SET SESSION debug_dbug=DEFAULT;
 DROP TABLE t1;
diff --git a/mysql-test/suite/archive/discover.test b/mysql-test/suite/archive/discover.test
index 567a57c4978..5ea02f47119 100644
--- a/mysql-test/suite/archive/discover.test
+++ b/mysql-test/suite/archive/discover.test
@@ -146,7 +146,7 @@ remove_file $mysqld_datadir/test/t1.ARZ;
 copy_file $MYSQL_TMP_DIR/t1.ARZ $mysqld_datadir/test/t1.ARZ;
 remove_file $MYSQL_TMP_DIR/t1.ARZ;
 show create table t1;
---error 1412
+--error ER_TABLE_DEF_CHANGED
 select * from t1, t1 as t2;
 flush tables;
 select * from t1, t1 as t2;
diff --git a/mysql-test/suite/archive/repair.result b/mysql-test/suite/archive/repair.result
index 16f0f2c1608..6a738e20628 100644
--- a/mysql-test/suite/archive/repair.result
+++ b/mysql-test/suite/archive/repair.result
@@ -1,10 +1,11 @@
 create table t1 (a int) engine=archive;
 insert into t1 values (1);
 select * from t1;
-Got one of the listed errors
+ERROR HY000: Can't lock file (errno: 2 "No such file or directory")
 insert into t1 values (2);
 ERROR HY000: Table 't1' is marked as crashed and should be repaired
 repair table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	repair	Error	Table 't1' is marked as crashed and should be repaired
 test.t1	repair	error	Corrupt
 drop table t1;
diff --git a/mysql-test/suite/archive/repair.test b/mysql-test/suite/archive/repair.test
index 03946d31ead..8eeb7912956 100644
--- a/mysql-test/suite/archive/repair.test
+++ b/mysql-test/suite/archive/repair.test
@@ -9,7 +9,7 @@
 create table t1 (a int) engine=archive;
 insert into t1 values (1);
 --remove_file $datadir/test/t1.ARZ
---error 13,1017
+--error ER_CANT_LOCK
 select * from t1;
 --error ER_CRASHED_ON_USAGE
 insert into t1 values (2);