diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:51:20 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:51:20 +0300 |
| commit | 93678f6bd9be1d320a63ae3fcf24493dae065ae7 (patch) | |
| tree | 63ed1b249c904afc7cd4046b592b8cb55cbacef8 /include | |
| parent | 485141ce7a6d34e2cf59eb5bf115d6941795043e (diff) | |
| parent | 0a929c5e6eb5042400a154fc01cae524f7d2e0a5 (diff) | |
| download | mariadb-git-93678f6bd9be1d320a63ae3fcf24493dae065ae7.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_row.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysqld_error.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 6faf876f2f1..93438f98255 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 59 Temple Placeo Suite 330, Boston, MA 02111-1307 USA */ /* Definefile for error messagenumbers */ @@ -386,4 +386,23 @@ #define ER_ILLEGAL_VALUE_FOR_TYPE 1367 #define ER_VIEW_NONUPD_CHECK 1368 #define ER_VIEW_CHECK_FAILED 1369 -#define ER_ERROR_MESSAGES 370 +#define ER_RELAY_LOG_FAIL 1370 +#define ER_PASSWD_LENGTH 1371 +#define ER_UNKNOWN_TARGET_BINLOG 1372 +#define ER_IO_ERR_LOG_INDEX_READ 1373 +#define ER_BINLOG_PURGE_PROHIBITED 1374 +#define ER_FSEEK_FAIL 1375 +#define ER_BINLOG_PURGE_FATAL_ERR 1376 +#define ER_LOG_IN_USE 1377 +#define ER_LOG_PURGE_UNKNOWN_ERR 1378 +#define ER_RELAY_LOG_INIT 1379 +#define ER_NO_BINARY_LOGGING 1380 +#define ER_RESERVED_SYNTAX 1381 +#define ER_WSAS_FAILED 1382 +#define ER_DIFF_GROUPS_PROC 1383 +#define ER_NO_GROUP_FOR_PROC 1384 +#define ER_ORDER_WITH_PROC 1385 +#define ER_LOGING_PROHIBIT_CHANGING_OF 1386 +#define ER_NO_FILE_MAPPING 1387 +#define ER_WRONG_MAGIC 1388 +#define ER_ERROR_MESSAGES 389 |