diff options
| author | unknown <venu@myvenu.com> | 2003-05-21 00:12:09 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-05-21 00:12:09 -0700 |
| commit | a8e5dcb449cf6af8eb76b7cc8ad65e19663d8107 (patch) | |
| tree | 390fab0240f652c5c3ddbf153549ac34cb5c1b2b /mysql-test/r/isam.result | |
| parent | 61fd4d561d3c421930823250c8e9039ff7c281e9 (diff) | |
| parent | c121cb748d9432561664ad020c3c48431fe2a48c (diff) | |
| download | mariadb-git-a8e5dcb449cf6af8eb76b7cc8ad65e19663d8107.tar.gz | |
Resolve merge colflict
mysql-test/r/create.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
include/mysqld_error.h:
Resolve merge colflict by changing the warning codes
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; |