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

manual merge

This commit is contained in:
kostja@oak.local
2003-07-31 17:11:52 +04:00
59 changed files with 1421 additions and 1563 deletions

View File

@ -288,4 +288,5 @@
#define ER_CANT_AGGREGATE_NCOLLATIONS 1269
#define ER_VARIABLE_IS_NOT_STRUCT 1270
#define ER_UNKNOWN_COLLATION 1271
#define ER_ERROR_MESSAGES 272
#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1272
#define ER_ERROR_MESSAGES 273