diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-28 20:12:14 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-28 20:12:14 +0200 |
| commit | 5fe662e290c536f294aae61fb9f7cfc7897b5a1d (patch) | |
| tree | ff655e477b0570f3c4aad9d7eeb3408e7dde97ec /include | |
| parent | 9e3552174b04edbaeaffa1fed4c796253f6402b1 (diff) | |
| parent | b9daa52c4b219494ea08539451e56bd291fb8a76 (diff) | |
| download | mariadb-git-5fe662e290c536f294aae61fb9f7cfc7897b5a1d.tar.gz | |
merging
include/mysqld_error.h:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 32e62d2aaa6..d0b3cc9aa4a 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -262,4 +262,5 @@ #define ER_CYCLIC_REFERENCE 1243 #define ER_AUTO_CONVERT 1244 #define ER_ILLEGAL_REFERENCE 1245 -#define ER_ERROR_MESSAGES 246 +#define ER_SELECT_REDUCED 1246 +#define ER_ERROR_MESSAGES 247 |