diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
| commit | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch) | |
| tree | 9a539823cdf05f53574fdf91941b3a242025acba /include | |
| parent | 0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff) | |
| parent | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff) | |
| download | mariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz | |
5.2 merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 11 | ||||
| -rw-r--r-- | include/violite.h | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/my_base.h b/include/my_base.h index 16f8803d2d5..e33a9fbcfb8 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -447,11 +447,12 @@ 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_ABORTED_BY_USER 179 -#define HA_ERR_DISK_FULL 180 -#define HA_ERR_LAST 180 /* Copy of last error nr */ +#define HA_ERR_TOO_MANY_CONCURRENT_TRXS 177 /*Too many active concurrent transactions */ +#define HA_ERR_ABORTED_BY_USER 178 +#define HA_ERR_DISK_FULL 179 +#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, |