diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
| commit | fdff9c0a4521e4006eb7dd718e19077afe6fbb37 (patch) | |
| tree | 4a4e924d33acb60a72c034f4b7ff58112c07d6dd /mysql-test/r/innodb.result | |
| parent | 1da42e7b8a4219827f4f435d837f41b1b1919d51 (diff) | |
| parent | 2197533b9b04a76f275e23a24449687089a1c528 (diff) | |
| download | mariadb-git-fdff9c0a4521e4006eb7dd718e19077afe6fbb37.tar.gz | |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 3ad645a6511..3598b15eb0a 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -144,7 +144,7 @@ test.t1 optimize error The handler for the table doesn't support check/repair a 2 Table Op Msg_type Msg_text -test.t1 check error The handler for the table doesn't support check/repair +test.t1 check status OK a b 2 testing Table Op Msg_type Msg_text |