diff options
| author | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | venu@myvenu.com <> | 2003-05-21 00:12:09 -0700 |
| commit | 39cbb547d433f7fdcfbe5655f14ffb8c93fe6122 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /mysql-test/r/isam.result | |
| parent | 9ad75823e7406c3afec09e642615e4821d25df5a (diff) | |
| parent | 666d46b6ee19c0399fadff220952a9ac9a097f85 (diff) | |
| download | mariadb-git-39cbb547d433f7fdcfbe5655f14ffb8c93fe6122.tar.gz | |
Resolve merge colflict
Diffstat (limited to 'mysql-test/r/isam.result')
| -rw-r--r-- | mysql-test/r/isam.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index 7032e506b91..6621be98073 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -57,14 +57,14 @@ test.t1 optimize status OK check table t1,t2; Table Op Msg_type Msg_text test.t1 check status OK -test.t2 check error The handler for the table doesn't support check +test.t2 check error The storage enginge for the table doesn't support check repair table t1,t2; Table Op Msg_type Msg_text test.t1 repair status OK -test.t2 repair error The handler for the table doesn't support repair +test.t2 repair error The storage enginge for the table doesn't support repair check table t2,t1; Table Op Msg_type Msg_text -test.t2 check error The handler for the table doesn't support check +test.t2 check error The storage enginge for the table doesn't support check test.t1 check status OK lock tables t1 write; check table t2,t1; |