diff options
| author | unknown <venu@myvenu.com> | 2003-01-28 21:02:20 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-01-28 21:02:20 -0800 |
| commit | a8abb0471ea4792fc002b817f130501e63e9507b (patch) | |
| tree | 0d2f858aa57583def97cae6a9c302e5a4fd514ca | |
| parent | b6315f6d9b7bfa16b16c23e95307b023336a6028 (diff) | |
| download | mariadb-git-a8abb0471ea4792fc002b817f130501e63e9507b.tar.gz | |
Fix for windows specific errors
| -rw-r--r-- | include/violite.h | 2 | ||||
| -rw-r--r-- | myisam/mi_check.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index c9e17cb05c1..fa8a3bf0d59 100644 --- a/include/violite.h +++ b/include/violite.h @@ -32,7 +32,7 @@ extern "C" { #endif /* __cplusplus */ enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, - VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL }; + VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY }; #ifndef __WIN__ #define HANDLE void * diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 271c6a55c8c..abd6cdde657 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3193,7 +3193,7 @@ static int sort_ft_key_write(MI_SORT_PARAM *sort_param, const void *a) } /* storing the key in the buffer. */ - memcpy (ft_buf->buf, a+val_off, val_len); + memcpy (ft_buf->buf, (char *)a+val_off, val_len); ft_buf->buf+=val_len; if (ft_buf->buf < ft_buf->end) return 0; |