correct server side error messages

5 files changed, 4 insertions, 29 deletions

diff --git a/sql/handler.h b/sql/handler.h
index f05fce39cfc..642a922b544 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -42,7 +42,6 @@
 
 // the following is for checking tables
 
-#define HA_ADMIN_VIEW_REPAIR_IS_DONE 2
 #define HA_ADMIN_ALREADY_DONE	  1
 #define HA_ADMIN_OK               0
 #define HA_ADMIN_NOT_IMPLEMENTED -1
@@ -57,7 +56,6 @@
 #define HA_ADMIN_NEEDS_UPGRADE  -10
 #define HA_ADMIN_NEEDS_ALTER    -11
 #define HA_ADMIN_NEEDS_CHECK    -12
-#define HA_ADMIN_NEEDS_REPAIR   -13
 
 /* Bits in table_flags() to show what database can do */
 
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 428be309c2a..6fcb460e6c6 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6565,9 +6565,3 @@ ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT
 ER_NO_SUCH_TABLE_IN_ENGINE 42S02 
         eng "Table '%-.192s.%-.192s' doesn't exist in engine"
         swe "Det finns ingen tabell som heter '%-.192s.%-.192s' i handlern"
-ER_NO_MARIADB_SERVER_FIELD
-        eng "view '%-.192s.%-.192s' has no field mariadb server in its .frm file"
-ER_VIEW_REPAIR_IS_DONE
-        eng "view is repaired"
-ER_NEEDS_REPAIR
-        eng "needs repair"
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 20c23afe228..65292a526fa 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -879,22 +879,6 @@ send_result_message:
       fatal_error=1;
       break;
     }
-    case HA_ADMIN_VIEW_REPAIR_IS_DONE:
-    {
-      protocol->store(STRING_WITH_LEN("status"), system_charset_info);
-      protocol->store(ER(ER_VIEW_REPAIR_IS_DONE),
-                      strlen(ER(ER_VIEW_REPAIR_IS_DONE)),
-                      system_charset_info);
-      break;
-    }
-    case HA_ADMIN_NEEDS_REPAIR:
-    {
-      protocol->store(STRING_WITH_LEN("status"), system_charset_info);
-      protocol->store(ER(ER_NEEDS_REPAIR),
-                      strlen(ER(ER_NEEDS_REPAIR)),
-                      system_charset_info);
-      break;
-    }
 
     default:				// Probably HA_ADMIN_INTERNAL_ERROR
       {
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 8be057eb08e..298c4e3150d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3023,7 +3023,6 @@ bool open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
   else if (table_list->open_strategy == TABLE_LIST::OPEN_STUB)
     DBUG_RETURN(FALSE);
 
-
 retry_share:
 
   mysql_mutex_lock(&LOCK_open);
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 8ba1e33836f..8f2e6092ff2 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -882,7 +882,7 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
                         "MERGE":"TEMPTABLE");
 
 
-  DBUG_RETURN(HA_ADMIN_VIEW_REPAIR_IS_DONE);
+  DBUG_RETURN(HA_ADMIN_OK);
 }
 
 
@@ -2049,11 +2049,11 @@ int view_check(THD *thd, TABLE_LIST *view, HA_CHECK_OPT *check_opt)
        !view->mariadb_version))
   {
     push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                            ER_NO_MARIADB_SERVER_FIELD,
-                            ER(ER_NO_MARIADB_SERVER_FIELD),
+                            ER_TABLE_NEEDS_UPGRADE,
+                            ER(ER_TABLE_NEEDS_UPGRADE),
                             view->db,
                             view->table_name);
-    DBUG_RETURN(HA_ADMIN_NEEDS_REPAIR);
+    DBUG_RETURN(HA_ADMIN_NEEDS_UPGRADE);
   }
   DBUG_RETURN(HA_ADMIN_OK);
 }