diff options
| author | unknown <monty@mysql.com> | 2003-12-30 13:16:49 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-30 13:16:49 +0200 |
| commit | b703338d76e40859ae39b669816eba768d0f7ed7 (patch) | |
| tree | 68178a5180429525e68155fcadd4072e95759e17 /include | |
| parent | 376fb08072e00c6be932b5c38ff6e23288e81e50 (diff) | |
| parent | d9ada7c257a4af713393cc536938e80156810418 (diff) | |
| download | mariadb-git-b703338d76e40859ae39b669816eba768d0f7ed7.tar.gz | |
Merge
sql/set_var.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'include')
| -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 9d3197c0bd4..acc9b5961c6 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -254,4 +254,5 @@ #define ER_NOT_SUPPORTED_YET 1235 #define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 #define ER_SLAVE_IGNORED_TABLE 1237 /* only the slave SQL thread can be sent this */ -#define ER_ERROR_MESSAGES 238 +#define ER_INCORRECT_GLOBAL_LOCAL_VAR 1238 +#define ER_ERROR_MESSAGES 239 |