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

resolved conflict with pulled changeset

Browse Source
This commit is contained in:
kostja@oak.local
2003-07-09 18:24:43 +04:00
parent 39e7db9f51 0f28677af6
commit 941a8623ca
56 changed files with 1425 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysqld_error.h
View File

@ -287,4 +287,5 @@
#define ER_CANT_AGGREGATE_3COLLATIONS 1268
#define ER_CANT_AGGREGATE_NCOLLATIONS 1269
#define ER_VARIABLE_IS_NOT_STRUCT 1270
#define ER_ERROR_MESSAGES 271
#define ER_SERVER_IS_IN_SECURE_AUTH_MODE 1271
#define ER_ERROR_MESSAGES 272