database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Conflicts resolved

Browse Source 
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
include/mysqld_error.h:
  merging
sql/share/english/errmsg.txt:
  merging
This commit is contained in:
unknown
2004-01-23 20:00:10 +04:00
parent 2320323a34 87b3ca5fe0
commit a6132c6f0a
17 changed files with 906 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysqld_error.h
View File

@ -304,4 +304,5 @@
#define ER_UNKNOWN_STORAGE_ENGINE 1285
#define ER_WARN_DEPRECATED_SYNTAX 1286
#define ER_NON_UPDATABLE_TABLE 1287
#define ER_ERROR_MESSAGES 288
#define ER_FEATURE_DISABLED 1288
#define ER_ERROR_MESSAGES 289