diff options
| author | unknown <serg@serg.mysql.com> | 2001-07-02 21:52:22 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-07-02 21:52:22 +0200 |
| commit | a1826b55198ebd1ea5a3bafb88a52d1cf0c2f427 (patch) | |
| tree | b02cd20fcbc632447cd4b10782204969c9e6af34 /include/mysqld_error.h | |
| parent | 2d28c646cbd53c1fcdf800dc408580aa5377f3b9 (diff) | |
| parent | cdfc04fb0819109ba3f7b78e87191b9b8311b9bf (diff) | |
| download | mariadb-git-a1826b55198ebd1ea5a3bafb88a52d1cf0c2f427.tar.gz | |
merged
include/my_base.h:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysys/tree.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/mysqld_error.h')
| -rw-r--r-- | include/mysqld_error.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 4f46c40ff49..106c49dc110 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -205,4 +205,12 @@ #define ER_SLAVE_THREAD 1202 #define ER_TOO_MANY_USER_CONNECTIONS 1203 #define ER_SET_CONSTANTS_ONLY 1204 -#define ER_ERROR_MESSAGES 205 +#define ER_LOCK_WAIT_TIMEOUT 1205 +#define ER_LOCK_TABLE_FULL 1206 +#define ER_READ_ONLY_TRANSACTION 1207 +#define ER_DROP_DB_WITH_READ_LOCK 1208 +#define ER_CREATE_DB_WITH_READ_LOCK 1209 +#define ER_CONNECT_TO_MASTER 1210 +#define ER_QUERY_ON_MASTER 1211 +#define ER_SHOW_BINLOG_EVENTS 1212 +#define ER_ERROR_MESSAGES 213 |