mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recommit for merging and pushing

Browse source
This commit is contained in:
Staale Smedseng 2009-02-27 16:11:15 +02:00
parent a6ac350b3a
commit 97b68934bc
7 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/preload.result
View file

@ -144,7 +144,7 @@ Key_reads 0
load index into cache t3, t2 key (primary,b) ; load index into cache t3, t2 key (primary,b) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t3 preload_keys Error Table 'test.t3' doesn't exist test.t3 preload_keys Error Table 'test.t3' doesn't exist
test.t3 preload_keys error Corrupt test.t3 preload_keys status Operation failed
test.t2 preload_keys status OK test.t2 preload_keys status OK
show status like "key_read%"; show status like "key_read%";
Variable_name Value Variable_name Value
@ -159,7 +159,7 @@ Key_reads 0
load index into cache t3 key (b), t2 key (c) ; load index into cache t3 key (b), t2 key (c) ;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t3 preload_keys Error Table 'test.t3' doesn't exist test.t3 preload_keys Error Table 'test.t3' doesn't exist
test.t3 preload_keys error Corrupt test.t3 preload_keys status Operation failed
test.t2 preload_keys Error Key 'c' doesn't exist in table 't2' test.t2 preload_keys Error Key 'c' doesn't exist in table 't2'
test.t2 preload_keys status Operation failed test.t2 preload_keys status Operation failed
show status like "key_read%"; show status like "key_read%";

12
mysql-test/r/ps.result
View file

@ -1386,13 +1386,13 @@ execute stmt;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair status OK
test.t4 repair Error Table 'test.t4' doesn't exist 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 test.t3 repair status OK
execute stmt; execute stmt;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair status OK
test.t4 repair Error Table 'test.t4' doesn't exist 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 test.t3 repair status OK
prepare stmt from "optimize table t1, t3, t4"; prepare stmt from "optimize table t1, t3, t4";
execute stmt; execute stmt;
@ -1400,23 +1400,23 @@ Table Op Msg_type Msg_text
test.t1 optimize status OK test.t1 optimize status OK
test.t3 optimize status OK test.t3 optimize status OK
test.t4 optimize Error Table 'test.t4' doesn't exist test.t4 optimize Error Table 'test.t4' doesn't exist
test.t4 optimize error Corrupt test.t4 optimize status Operation failed
execute stmt; execute stmt;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize status Table is already up to date test.t1 optimize status Table is already up to date
test.t3 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 Table 'test.t4' doesn't exist
test.t4 optimize error Corrupt test.t4 optimize status Operation failed
prepare stmt from "analyze table t4, t1"; prepare stmt from "analyze table t4, t1";
execute stmt; execute stmt;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t4 analyze Error Table 'test.t4' doesn't exist 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 test.t1 analyze status Table is already up to date
execute stmt; execute stmt;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t4 analyze Error Table 'test.t4' doesn't exist 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 test.t1 analyze status Table is already up to date
deallocate prepare stmt; deallocate prepare stmt;
drop table t1, t2, t3; drop table t1, t2, t3;

2
mysql-test/r/repair.result
View file

@ -27,7 +27,7 @@ drop table t1;
repair table t1 use_frm; repair table t1 use_frm;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair Error Table 'test.t1' doesn't exist test.t1 repair Error Table 'test.t1' doesn't exist
test.t1 repair error Corrupt test.t1 repair status Operation failed
create table t1 engine=myisam SELECT 1,"table 1"; create table t1 engine=myisam SELECT 1,"table 1";
flush tables; flush tables;
repair table t1; repair table t1;

2
mysql-test/r/rpl_failed_optimize.result
View file

@ -16,5 +16,5 @@ Error 1205 Lock wait timeout exceeded; try restarting transaction
OPTIMIZE TABLE non_existing; OPTIMIZE TABLE non_existing;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.non_existing optimize Error Table 'test.non_existing' doesn't exist test.non_existing optimize Error Table 'test.non_existing' doesn't exist
test.non_existing optimize error Corrupt test.non_existing optimize status Operation failed
drop table t1; drop table t1;

2
mysql-test/suite/funcs_1/r/innodb_views.result
View file

@ -21367,7 +21367,7 @@ ERROR 42S02: Table 'test.v1' doesn't exist
CHECK TABLE v1; CHECK TABLE v1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.v1 check Error Table 'test.v1' doesn't exist test.v1 check Error Table 'test.v1' doesn't exist
test.v1 check error Corrupt test.v1 check status Operation failed
DESCRIBE v1; DESCRIBE v1;
ERROR 42S02: Table 'test.v1' doesn't exist ERROR 42S02: Table 'test.v1' doesn't exist
EXPLAIN SELECT * FROM v1; EXPLAIN SELECT * FROM v1;

2
mysql-test/suite/funcs_1/r/memory_views.result
View file

@ -21368,7 +21368,7 @@ ERROR 42S02: Table 'test.v1' doesn't exist
CHECK TABLE v1; CHECK TABLE v1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.v1 check Error Table 'test.v1' doesn't exist test.v1 check Error Table 'test.v1' doesn't exist
test.v1 check error Corrupt test.v1 check status Operation failed
DESCRIBE v1; DESCRIBE v1;
ERROR 42S02: Table 'test.v1' doesn't exist ERROR 42S02: Table 'test.v1' doesn't exist
EXPLAIN SELECT * FROM v1; EXPLAIN SELECT * FROM v1;

7
sql/sql_table.cc
View file

@ -2314,7 +2314,12 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM) view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_VIEW_CHECKSUM, ER(ER_VIEW_CHECKSUM)); ER_VIEW_CHECKSUM, ER(ER_VIEW_CHECKSUM));
result_code= HA_ADMIN_CORRUPT; if (thd->net.last_errno == ER_NO_SUCH_TABLE)
/* A missing table is just issued as a failed command */
result_code= HA_ADMIN_FAILED;
else
/* Default failure code is corrupt table */
result_code= HA_ADMIN_CORRUPT;
goto send_result; goto send_result;
} }