database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Manual merge fixes

Browse Source
This commit is contained in:
dlenev@mysql.com
2003-09-01 16:14:54 +04:00
parent fe98e58037 2486222cd2
commit 73ab4be246
43 changed files with 401 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysqld_error.h
View File

@ -289,4 +289,5 @@
#define ER_CANT_AGGREGATE_NCOLLATIONS 1270
#define ER_VARIABLE_IS_NOT_STRUCT 1271
#define ER_UNKNOWN_COLLATION 1272
#define ER_ERROR_MESSAGES 273
#define ER_SLAVE_IGNORED_SSL_PARAMS 1273
#define ER_ERROR_MESSAGES 274