database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Resolve merge colflict

Browse Source
This commit is contained in:
venu@myvenu.com
2003-05-21 00:12:09 -07:00
parent 9ad75823e7 666d46b6ee
commit 39cbb547d4
132 changed files with 1238 additions and 39342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/isam.result
View File

@ -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;