diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-06 17:44:33 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-06-06 17:44:33 +0500 |
| commit | 7fac151beaf476189878204bbee60f762174a760 (patch) | |
| tree | 935fe9e67d99ed4d697a9516096790cb8dfce487 /include | |
| parent | ac366a4ba59a4422aed2b1a0d3963794b997f668 (diff) | |
| parent | d1a1d24c1f95bd50a8105f120a284ff4bf4ccdd6 (diff) | |
| download | mariadb-git-7fac151beaf476189878204bbee60f762174a760.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index d2fc5bbc77f..ccccb188037 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -282,4 +282,6 @@ #define ER_WARN_DATA_TRUNCATED 1263 #define ER_WARN_USING_OTHER_HANDLER 1264 #define ER_CANT_AGGREGATE_COLLATIONS 1265 +#define ER_DROP_USER 1266 +#define ER_REVOKE_GRANTS 1267 #define ER_ERROR_MESSAGES 266 |