summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2009-03-06 16:11:34 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2009-03-06 16:11:34 +0100
commitcee070e1bb20552136b2ed5f2351d3b685fbddeb (patch)
tree7fc5bfde8b352f380a7308cd118a1023c1ddd138 /mysql-test/r/ps.result
parent13328b0f45c449020b3b70ed9de1668e16d51bb4 (diff)
parent53802ae6ca0ea2d95c9d24b8c07a27213406131e (diff)
downloadmariadb-git-cee070e1bb20552136b2ed5f2351d3b685fbddeb.tar.gz
manual merge
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r--mysql-test/r/ps.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index f263ff23088..1f8a077af40 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1396,13 +1396,13 @@ execute stmt;
Table Op Msg_type Msg_text
test.t1 repair status OK
test.t4 repair Error Table 'test.t4' doesn't exist
-test.t4 repair error Corrupt
+test.t4 repair status Operation failed
test.t3 repair status OK
execute stmt;
Table Op Msg_type Msg_text
test.t1 repair status OK
test.t4 repair Error Table 'test.t4' doesn't exist
-test.t4 repair error Corrupt
+test.t4 repair status Operation failed
test.t3 repair status OK
prepare stmt from "optimize table t1, t3, t4";
execute stmt;
@@ -1410,23 +1410,23 @@ Table Op Msg_type Msg_text
test.t1 optimize status OK
test.t3 optimize status OK
test.t4 optimize Error Table 'test.t4' doesn't exist
-test.t4 optimize error Corrupt
+test.t4 optimize status Operation failed
execute stmt;
Table Op Msg_type Msg_text
test.t1 optimize status Table is already up to date
test.t3 optimize status Table is already up to date
test.t4 optimize Error Table 'test.t4' doesn't exist
-test.t4 optimize error Corrupt
+test.t4 optimize status Operation failed
prepare stmt from "analyze table t4, t1";
execute stmt;
Table Op Msg_type Msg_text
test.t4 analyze Error Table 'test.t4' doesn't exist
-test.t4 analyze error Corrupt
+test.t4 analyze status Operation failed
test.t1 analyze status Table is already up to date
execute stmt;
Table Op Msg_type Msg_text
test.t4 analyze Error Table 'test.t4' doesn't exist
-test.t4 analyze error Corrupt
+test.t4 analyze status Operation failed
test.t1 analyze status Table is already up to date
deallocate prepare stmt;
drop table t1, t2, t3;