diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 1 | ||||
| -rw-r--r-- | include/mysql.h | 3 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index bb2e4128195..2e097f26dc1 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -214,6 +214,7 @@ enum ha_base_keytype { #define HA_ERR_LOCK_WAIT_TIMEOUT 146 #define HA_ERR_LOCK_TABLE_FULL 147 #define HA_ERR_READ_ONLY_TRANSACTION 148 /* Updates not allowed */ +#define HA_ERR_LOCK_DEADLOCK 149 /* Other constants */ diff --git a/include/mysql.h b/include/mysql.h index b5d918a98af..bd54be0bc22 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -36,6 +36,9 @@ extern "C" { #ifndef _global_h /* If not standard header */ #include <sys/types.h> +#ifdef __LCC__ +#include <winsock.h> /* For windows */ +#endif typedef char my_bool; #if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__) #define __WIN__ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 08e621f4a2a..cbdf0efb122 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -213,4 +213,5 @@ #define ER_WRONG_ARGUMENTS 1210 #define ER_NO_PERMISSON_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 -#define ER_ERROR_MESSAGES 213 +#define ER_LOCK_DEADLOCK 1213 +#define ER_ERROR_MESSAGES 214 |