bzr commit into mysql-5.0-bugteam branch (staale.smedseng:2760)

[Staale Smedseng]

#At file:///Users/staale/z/b29458-50p/ based on revid:aelkin@stripped

 2760 Staale Smedseng	2009-02-27
      Recommit for merging and pushing

    modified:
      mysql-test/r/preload.result
      mysql-test/r/ps.result
      mysql-test/r/repair.result
      mysql-test/r/rpl_failed_optimize.result
      mysql-test/suite/funcs_1/r/innodb_views.result
      mysql-test/suite/funcs_1/r/memory_views.result
      sql/sql_table.cc
=== modified file 'mysql-test/r/preload.result'
--- a/mysql-test/r/preload.result	2007-06-05 23:42:41 +0000
+++ b/mysql-test/r/preload.result	2009-02-27 14:11:15 +0000
@@ -144,7 +144,7 @@ Key_reads	0
 load index into cache t3, t2 key (primary,b) ;
 Table	Op	Msg_type	Msg_text
 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
 show status like "key_read%";
 Variable_name	Value
@@ -159,7 +159,7 @@ Key_reads	0
 load index into cache t3 key (b), t2 key (c) ;
 Table	Op	Msg_type	Msg_text
 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	status	Operation failed
 show status like "key_read%";

=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2008-07-07 16:00:08 +0000
+++ b/mysql-test/r/ps.result	2009-02-27 14:11:15 +0000
@@ -1386,13 +1386,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;
@@ -1400,23 +1400,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;

=== modified file 'mysql-test/r/repair.result'
--- a/mysql-test/r/repair.result	2008-05-12 16:01:13 +0000
+++ b/mysql-test/r/repair.result	2009-02-27 14:11:15 +0000
@@ -27,7 +27,7 @@ drop table t1;
 repair table t1 use_frm;
 Table	Op	Msg_type	Msg_text
 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";
 flush tables;
 repair table t1;

=== modified file 'mysql-test/r/rpl_failed_optimize.result'
--- a/mysql-test/r/rpl_failed_optimize.result	2007-06-05 23:42:41 +0000
+++ b/mysql-test/r/rpl_failed_optimize.result	2009-02-27 14:11:15 +0000
@@ -16,5 +16,5 @@ Error	1205	Lock wait timeout exceeded; t
 OPTIMIZE TABLE non_existing;
 Table	Op	Msg_type	Msg_text
 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;

=== modified file 'mysql-test/suite/funcs_1/r/innodb_views.result'
--- a/mysql-test/suite/funcs_1/r/innodb_views.result	2008-05-13 13:46:38 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result	2009-02-27 14:11:15 +0000
@@ -21367,7 +21367,7 @@ ERROR 42S02: Table 'test.v1' doesn't exi
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
 test.v1	check	Error	Table 'test.v1' doesn't exist
-test.v1	check	error	Corrupt
+test.v1	check	status	Operation failed
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;

=== modified file 'mysql-test/suite/funcs_1/r/memory_views.result'
--- a/mysql-test/suite/funcs_1/r/memory_views.result	2009-02-14 15:58:07 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_views.result	2009-02-27 14:11:15 +0000
@@ -21368,7 +21368,7 @@ ERROR 42S02: Table 'test.v1' doesn't exi
 CHECK TABLE v1;
 Table	Op	Msg_type	Msg_text
 test.v1	check	Error	Table 'test.v1' doesn't exist
-test.v1	check	error	Corrupt
+test.v1	check	status	Operation failed
 DESCRIBE v1;
 ERROR 42S02: Table 'test.v1' doesn't exist
 EXPLAIN SELECT * FROM v1;

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-12-09 12:38:52 +0000
+++ b/sql/sql_table.cc	2009-02-27 14:11:15 +0000
@@ -2314,7 +2314,12 @@ static bool mysql_admin_table(THD* thd, 
           view_checksum(thd, table) == HA_ADMIN_WRONG_CHECKSUM)
         push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
                      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;
     }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]