diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /mysys | |
parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz |
MySQL-5.5.35 merge
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/CMakeLists.txt | 4 | ||||
-rw-r--r-- | mysys/mf_iocache2.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index f90ad0e7aaf..e0f2de4a61b 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -87,3 +87,7 @@ ADD_EXECUTABLE(thr_lock thr_lock.c) TARGET_LINK_LIBRARIES(thr_lock mysys) SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") +INSTALL_DEBUG_SYMBOLS(mysys) +IF(MSVC) + INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug) +ENDIF() diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 250dc5064a9..c447c4b44a1 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -467,7 +467,7 @@ process_flags: { register int iarg; size_t length2; - char buff[17]; + char buff[32]; iarg = va_arg(args, int); if (*fmt == 'd') @@ -502,7 +502,7 @@ process_flags: { register long iarg; size_t length2; - char buff[17]; + char buff[32]; iarg = va_arg(args, long); if (*++fmt == 'd') |