summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
diff options
context:
space:
mode:
authorDaniel Black <grooverdan@users.sourceforge.net>2015-04-12 21:40:07 +1000
committerDaniel Black <grooverdan@users.sourceforge.net>2015-04-12 21:40:07 +1000
commit4409e04d891fba62a3f4ed291c96ee34d645dbec (patch)
tree5f43fbf6087943709b2b081f1d82450477aa37ce /sql/sql_view.cc
parent9b067a3e9fa253f90e8cb05b2c9d084900637a1d (diff)
downloadmariadb-git-4409e04d891fba62a3f4ed291c96ee34d645dbec.tar.gz
correct server side error messages
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r--sql/sql_view.cc8
1 files changed, 4 insertions, 4 deletions
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);
}