diff options
| author | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-17 23:26:00 +0200 |
| commit | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (patch) | |
| tree | a544afdc5cdc3dba7918f6a0d8f1341a2fe74ff2 /include | |
| parent | 9f939ecce6ccf73c5192d721d826f0a2a58a9b3e (diff) | |
| parent | 9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff) | |
| download | mariadb-git-d8ae9669cd11f9c61105a9cbf19f9318a0e783fc.tar.gz | |
merge
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/my_base.h:
Auto merged
include/mysql.h:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
client/mysqltest.c:
Auto merged
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 | 17 |
3 files changed, 13 insertions, 8 deletions
diff --git a/include/my_base.h b/include/my_base.h index c4c1a0763fd..800e623bc2c 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -217,6 +217,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 3431dc61945..3e3a6f35e56 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -34,6 +34,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 b81e10308ff..8f78d6190b1 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -213,11 +213,12 @@ #define ER_WRONG_ARGUMENTS 1210 #define ER_NO_PERMISSION_TO_CREATE_USER 1211 #define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212 -#define ER_CONNECT_TO_MASTER 1213 -#define ER_QUERY_ON_MASTER 1214 -#define ER_ERROR_WHEN_EXECUTING_COMMAND 1215 -#define ER_WRONG_USAGE 1216 -#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1217 -#define ER_CANT_UPDATE_WITH_READLOCK 1218 -#define ER_MIXING_NOT_ALLOWED 1219 -#define ER_ERROR_MESSAGES 220 +#define ER_LOCK_DEADLOCK 1213 +#define ER_CONNECT_TO_MASTER 1214 +#define ER_QUERY_ON_MASTER 1215 +#define ER_ERROR_WHEN_EXECUTING_COMMAND 1216 +#define ER_WRONG_USAGE 1217 +#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218 +#define ER_CANT_UPDATE_WITH_READLOCK 1219 +#define ER_MIXING_NOT_ALLOWED 1220 +#define ER_ERROR_MESSAGES 221 |