diff options
| author | vva@eagle.mysql.r18.ru <> | 2003-12-18 18:07:39 -0400 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2003-12-18 18:07:39 -0400 |
| commit | f70b3897c4ce511750d4de4bca035717a748985c (patch) | |
| tree | 49a6fb185720692a3dc6f09af2bf354938b4d549 /include | |
| parent | 07f520b73e1f0f436630158acfcc5f5f12969424 (diff) | |
| parent | d49ff0fd62a1cc2ac222ffdad37a781f7d014acb (diff) | |
| download | mariadb-git-f70b3897c4ce511750d4de4bca035717a748985c.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
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 |