diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
| commit | 0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch) | |
| tree | 7e682617fcbdab399d2eafccb6a4800dfdc71e51 /include | |
| parent | 97ae1682f185be05276b172919e47fd86e9fd953 (diff) | |
| parent | df905524b218de07dddf5fa394af96edcc4ca483 (diff) | |
| download | mariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz | |
merge with mysql-5.1.63
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 8 | ||||
| -rw-r--r-- | include/violite.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index 8bc484eea0a..0fb1158e27b 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -454,9 +454,11 @@ enum ha_base_keytype { #define HA_ERR_INITIALIZATION 174 /* Error during initialization */ #define HA_ERR_FILE_TOO_SHORT 175 /* File too short */ #define HA_ERR_WRONG_CRC 176 /* Wrong CRC on page */ -#define HA_ERR_ROW_NOT_VISIBLE 177 -#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 178 /*Too many active concurrent transactions */ -#define HA_ERR_LAST 178 /* Copy of last error nr */ +#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 177 /*Too many active concurrent transactions */ + +#define HA_ERR_ROW_NOT_VISIBLE 180 /*Too many active concurrent transactions */ +#define HA_ERR_TABLE_IN_FK_CHECK 181 /* Table being used in foreign key check */ +#define HA_ERR_LAST 181 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/violite.h b/include/violite.h index c5c9ee89110..c490f022c38 100644 --- a/include/violite.h +++ b/include/violite.h @@ -61,6 +61,9 @@ int vio_close_pipe(Vio * vio); #define HANDLE void * #endif /* __WIN__ */ +/* backport from 5.6 where it is part of PSI, not vio_*() */ +int mysql_socket_shutdown(my_socket mysql_socket, int how); + void vio_delete(Vio* vio); int vio_close(Vio* vio); void vio_reset(Vio* vio, enum enum_vio_type type, |