diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-17 23:43:53 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 23:43:53 +0300 |
| commit | ffe994614f09f79104a20fe75b1e2986d062523a (patch) | |
| tree | 6197f5bbc2fc564444d37f990227096a4582226f /include | |
| parent | 45ea63fec3b9cf740c363508730bb2ce63de719a (diff) | |
| download | mariadb-git-ffe994614f09f79104a20fe75b1e2986d062523a.tar.gz | |
Added unique error for DEADLOCK
Include missing man pages into binary distribution
BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
Changelog
extra/perror.c:
Added missing error codes
include/my_base.h:
Added unique error for DEADLOCK
include/mysql.h:
Portability fix for the LCC windows compiler
include/mysqld_error.h:
Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
Include missing man pages into binary distribution
sql/ha_berkeley.cc:
Added unique error for DEADLOCK
sql/ha_berkeley.h:
Added unique error for DEADLOCK
sql/handler.h:
Added unique error for DEADLOCK
sql/mysqld.cc:
Portability fix
sql/share/czech/errmsg.txt:
Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
Added unique error for DEADLOCK
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 |