diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-28 11:16:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-28 11:16:26 +0200 |
| commit | f13905e1e97167c4d01ab99866d6addbb2fb2d85 (patch) | |
| tree | 1646b55b690c27b19b4440fd21b75fac88966cc2 /vio | |
| parent | 1413fdb24e0acc72299e95daff983364e17c3796 (diff) | |
| parent | 8e0805db78e2f2609ac17dd22dac6a76a6d214f8 (diff) | |
| download | mariadb-git-f13905e1e97167c4d01ab99866d6addbb2fb2d85.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'vio')
| -rwxr-xr-x | vio/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | vio/viosocket.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt index e4940d54da8..83cd6f65e6d 100755 --- a/vio/CMakeLists.txt +++ b/vio/CMakeLists.txt @@ -18,4 +18,10 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUT ADD_DEFINITIONS(-DUSE_SYMDIR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include) -ADD_LIBRARY(vio vio.c viosocket.c viossl.c viosslfactories.c) + +SET(VIO_SOURCES vio.c viosocket.c viossl.c viosslfactories.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(vio ${VIO_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) + diff --git a/vio/viosocket.c b/vio/viosocket.c index 5d8ca6d118c..942f0330c57 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -80,7 +80,7 @@ size_t vio_read_buff(Vio *vio, uchar* buf, size_t size) } else if (size < VIO_UNBUFFERED_READ_MIN_SIZE) { - rc= vio_read(vio, vio->read_buffer, VIO_READ_BUFFER_SIZE); + rc= vio_read(vio, (uchar*) vio->read_buffer, VIO_READ_BUFFER_SIZE); if (rc != 0 && rc != (size_t) -1) { if (rc > size) |