diff options
| author | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2003-09-01 16:14:54 +0400 |
| commit | 73ab4be246dd8c0dac3c68065f4977d01adb6383 (patch) | |
| tree | 0b20b02505735c5ed244512265fcc8f74c3f6de2 /include/mysqld_error.h | |
| parent | fe98e58037ca0604414a668f51cff95bf4953cab (diff) | |
| parent | 2486222cd2192418b7bdcbf89a42d77e698f1899 (diff) | |
| download | mariadb-git-73ab4be246dd8c0dac3c68065f4977d01adb6383.tar.gz | |
Manual merge fixes
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index d2240b7a28e..86bd885d4b2 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -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 |