diff options
| author | unknown <serg@serg.mysql.com> | 2002-11-09 20:29:22 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-11-09 20:29:22 +0100 |
| commit | dce4b2c9589e73be9b7a0b2c81ae06ee47eb09c2 (patch) | |
| tree | 185289eb30f9bf1d86aebbc37051b956df44c815 /mysql-test | |
| parent | bfec3dab334b133cc7a23f42aa6810844833b608 (diff) | |
| parent | bb2ceda1b2b8bba35bcabcc63dba3d95c67fa85a (diff) | |
| download | mariadb-git-dce4b2c9589e73be9b7a0b2c81ae06ee47eb09c2.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/isam.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index d19352aad42..0f7224f52da 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -47,14 +47,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/repair +test.t2 check error The handler 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 check/repair +test.t2 repair error The handler 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/repair +test.t2 check error The handler for the table doesn't support check test.t1 check status OK lock tables t1 write; check table t2,t1; diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 1a40c5b11c3..fdcc7f9cdea 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1331,10 +1331,10 @@ table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index NULL fld3 30 NULL 1199 Using where; Using index +t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index NULL fld3 30 NULL 1199 Using where; Using index +t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 Using where; Using index |