diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 3b504eb50b0..473e172adf9 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -483,14 +483,17 @@ static int process_all_tables_in_db(char *database)
 {
   MYSQL_RES *res;
   MYSQL_ROW row;
+  uint num_columns;
 
   LINT_INIT(res);
   if (use_db(database))
     return 1;
-  if (mysql_query(sock, "SHOW TABLE STATUS") ||
+  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||
 	!((res= mysql_store_result(sock))))
     return 1;
 
+  num_columns= mysql_num_fields(res);
+
   if (opt_all_in_1)
   {
     /*
@@ -513,12 +516,11 @@ static int process_all_tables_in_db(char *database)
     }
     for (end = tables + 1; (row = mysql_fetch_row(res)) ;)
     {
-      /* Skip tables with an engine of NULL (probably a view). */
-      if (row[1])
-      {
-        end= fix_table_name(end, row[0]);
-        *end++= ',';
-      }
+      if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))
+        continue;
+
+      end= fix_table_name(end, row[0]);
+      *end++= ',';
     }
     *--end = 0;
     if (tot_length)
@@ -531,6 +533,9 @@ static int process_all_tables_in_db(char *database)
       /* Skip tables with an engine of NULL (probably a view). */
       if (row[1])
       {
+        if ((num_columns == 2) && (strcmp(row[1], "VIEW") == 0))
+          continue;
+        
         handle_request_for_tables(row[0], fixed_name_length(row[0]));
       }
   }
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index f8a28009c42..7c72cfeb889 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -46,4 +46,14 @@ create table `t 1`(a int);
 test.t 1                                           OK
 test.t`1                                           OK
 drop table `t``1`, `t 1`;
+create database d_bug25347;
+use d_bug25347;
+create table t_bug25347 (a int);
+create view v_bug25347 as select * from t_bug25347;
+removing and creating
+d_bug25347.t_bug25347                              OK
+drop view v_bug25347;
+drop table t_bug25347;
+drop database d_bug25347;
+use test;
 End of 5.0 tests
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 04e7b6b4bdb..532e34d1980 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -40,4 +40,20 @@ create table `t 1`(a int);
 --exec $MYSQL_CHECK --databases test
 drop table `t``1`, `t 1`;
 
+#
+# Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
+#
+create database d_bug25347;
+use d_bug25347;
+create table t_bug25347 (a int);
+create view v_bug25347 as select * from t_bug25347;
+--echo removing and creating
+--exec rm    $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI;
+--exec touch $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI;
+--exec $MYSQL_CHECK --repair --databases d_bug25347
+drop view v_bug25347;
+drop table t_bug25347;
+drop database d_bug25347;
+use test;
+
 --echo End of 5.0 tests