diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 07:24:04 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 07:24:04 +0300 |
| commit | 2ee21c9c46abb71d1bb1200bb77dada3969d49fb (patch) | |
| tree | 368e07bec37e044cbac9f95a7ca572c494968756 /include | |
| parent | 515c747dcfcca8d04a509496c5864f302d6d76be (diff) | |
| download | mariadb-git-2ee21c9c46abb71d1bb1200bb77dada3969d49fb.tar.gz | |
Cleanup after last merge
client/mysqltest.c:
Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
Made error messages more general
libmysqld/Makefile.am:
md5 is now in mysys
mysql-test/include/have_isam.inc:
Update to new result format
mysql-test/include/not_embedded.inc:
Update to new result format
mysql-test/mysql-test-run.sh:
Update to new result format
mysql-test/r/auto_increment.result:
Update to new result format
mysql-test/r/count_distinct2.result:
Update to new result format
mysql-test/r/create.result:
Update to new result format
mysql-test/r/func_system.result:
Update to new result format
mysql-test/r/isam.result:
Update to new result format
mysql-test/r/lock.result:
Update to new result format
mysql-test/r/lock_multi.result:
Update to new result format
mysql-test/r/rename.result:
Update to new result format
mysql-test/r/rpl000001.result:
Fix wrong test
mysql-test/r/tablelock.result:
Update to new result format
mysql-test/t/rename.test:
Update to new result format
sql/share/czech/errmsg.txt:
Made error messages more general
sql/share/danish/errmsg.txt:
Made error messages more general
sql/share/dutch/errmsg.txt:
Made error messages more general
sql/share/english/errmsg.txt:
Made error messages more general
sql/share/estonian/errmsg.txt:
Made error messages more general
sql/share/french/errmsg.txt:
Made error messages more general
sql/share/german/errmsg.txt:
Made error messages more general
sql/share/greek/errmsg.txt:
Made error messages more general
sql/share/hungarian/errmsg.txt:
Made error messages more general
sql/share/italian/errmsg.txt:
Made error messages more general
sql/share/japanese/errmsg.txt:
Made error messages more general
sql/share/korean/errmsg.txt:
Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
Made error messages more general
sql/share/norwegian/errmsg.txt:
Made error messages more general
sql/share/polish/errmsg.txt:
Made error messages more general
sql/share/portuguese/errmsg.txt:
Made error messages more general
sql/share/romanian/errmsg.txt:
Made error messages more general
sql/share/russian/errmsg.txt:
Made error messages more general
sql/share/slovak/errmsg.txt:
Made error messages more general
sql/share/spanish/errmsg.txt:
Made error messages more general
sql/share/swedish/errmsg.txt:
Made error messages more general
sql/share/ukrainian/errmsg.txt:
Made error messages more general
sql/sql_lex.cc:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
Cleanup
support-files/mysql.spec.sh:
Create MySQL-embedded rpm
tools/mysqlmanager.c:
Fix bug in merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index cb555eb8066..a4e7066d483 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -221,7 +221,5 @@ #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218 #define ER_CANT_UPDATE_WITH_READLOCK 1219 #define ER_MIXING_NOT_ALLOWED 1220 -#define ER_GRANT_DUPL_SUBJECT 1221 -#define ER_GRANT_DUPL_ISSUER 1222 -#define ER_GRANT_DUPL_CIPHER 1223 -#define ER_ERROR_MESSAGES 224 +#define ER_DUP_ARGUMENT 1221 +#define ER_ERROR_MESSAGES 222 |