summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-02 23:41:10 +0200
committerunknown <serg@serg.mylan>2003-10-02 23:41:10 +0200
commit7154615de30122f4dcf719b11fcbc32563ff11d2 (patch)
treef3a08b3663737de74d20769d416db7cf740d1381 /sql
parentc54e1732190b5ef54a4bdd54e296266a531673c6 (diff)
downloadmariadb-git-7154615de30122f4dcf719b11fcbc32563ff11d2.tar.gz
minor error messages cleanup
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_acl.cc5
-rw-r--r--sql/sql_update.cc3
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 508ff88a0cf..82450704ee0 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3589,8 +3589,13 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
VOID(pthread_mutex_unlock(&acl_cache->lock));
rw_unlock(&LOCK_grant);
close_thread_tables(thd);
+#ifdef TO_BE_DELETED
+ /* XXX this should not be necessary. The error message is already printed */
+ /* when this code is deleted, the error slot (error 1268) can be reused,
+ as this error code was not present in any MySQL release */
if (result)
my_error(ER_REVOKE_GRANTS, MYF(0));
+#endif
DBUG_RETURN(result);
}
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 7430029a5e5..b322957b20b 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -493,8 +493,7 @@ int multi_update::prepare(List<Item> &not_used_values, SELECT_LEX_UNIT *unit)
if (!tables_to_update)
{
- my_error(ER_NOT_SUPPORTED_YET, MYF(0),
- "You didn't specify any tables to UPDATE");
+ my_error(ER_NO_TABLES_USED, MYF(0));
DBUG_RETURN(1);
}