summaryrefslogtreecommitdiff
path: root/include/mysqld_error.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-11-27 23:07:30 +0100
committerunknown <serg@serg.mylan>2004-11-27 23:07:30 +0100
commit257763a9a35ff4212f71ccf356859d115899f430 (patch)
tree6aee196afde28c5ab6978f8c8b0563c01cdb5f8e /include/mysqld_error.h
parentcf1de7d9da102d11c3ac81efc5dbb51077dc235f (diff)
downloadmariadb-git-257763a9a35ff4212f71ccf356859d115899f430.tar.gz
create/drop/rename user cleanup
dbug/user.r: help cralified include/mysqld_error.h: new error message added mysql-test/r/grant.result: results updated mysql-test/r/grant2.result: results updated mysql-test/t/grant.test: results updated mysql-test/t/grant2.test: results updated sql/share/czech/errmsg.txt: error message updated sql/share/danish/errmsg.txt: error message updated sql/share/dutch/errmsg.txt: error message updated sql/share/english/errmsg.txt: error message updated sql/share/estonian/errmsg.txt: error message updated sql/share/french/errmsg.txt: error message updated sql/sql_acl.cc: changed error reporting for create/drop/rename user to be consistent with drop table sql/share/german/errmsg.txt: error message updated sql/share/greek/errmsg.txt: error message updated sql/share/hungarian/errmsg.txt: error message updated sql/share/italian/errmsg.txt: error message updated sql/share/japanese/errmsg.txt: error message updated sql/share/korean/errmsg.txt: error message updated sql/share/norwegian-ny/errmsg.txt: error message updated sql/share/norwegian/errmsg.txt: error message updated sql/share/polish/errmsg.txt: error message updated sql/share/portuguese/errmsg.txt: error message updated sql/share/romanian/errmsg.txt: error message updated sql/share/russian/errmsg.txt: error message updated sql/share/serbian/errmsg.txt: error message updated sql/share/slovak/errmsg.txt: error message updated sql/share/spanish/errmsg.txt: error message updated sql/share/swedish/errmsg.txt: error message updated sql/share/ukrainian/errmsg.txt: error message updated
Diffstat (limited to 'include/mysqld_error.h')
-rw-r--r--include/mysqld_error.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index f5994e8e71d..99f126cc23d 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -284,7 +284,7 @@
#define ER_WARN_DATA_TRUNCATED 1265
#define ER_WARN_USING_OTHER_HANDLER 1266
#define ER_CANT_AGGREGATE_2COLLATIONS 1267
-#define ER_HANDLE_USER 1268
+#define ER_DROP_USER 1268
#define ER_REVOKE_GRANTS 1269
#define ER_CANT_AGGREGATE_3COLLATIONS 1270
#define ER_CANT_AGGREGATE_NCOLLATIONS 1271
@@ -412,4 +412,5 @@
#define ER_VIEW_MULTIUPDATE 1393
#define ER_VIEW_NO_INSERT_FIELD_LIST 1394
#define ER_VIEW_DELETE_MERGE_VIEW 1395
-#define ER_ERROR_MESSAGES 396
+#define ER_CANNOT_USER 1396
+#define ER_ERROR_MESSAGES 397