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

Conflicts resolved

This commit is contained in:
hf@deer.(none)
2004-01-23 20:00:10 +04:00
17 changed files with 906 additions and 738 deletions

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