diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 22:41:58 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 22:41:58 +0100 |
commit | c4cb24006139bb6a619ca9d6b00d00c2275d2c28 (patch) | |
tree | a9edb0480f4e20aef8c15f2e415f56d2c7681feb /client | |
parent | 1e361f286bc2cd42c79a4c0ac40209d222e60b11 (diff) | |
download | mariadb-git-c4cb24006139bb6a619ca9d6b00d00c2275d2c28.tar.gz |
MDEV-9024 Build fails with VS2015
cherry-pick f1daf9ce from 10.0 branch
-------------------------------------
Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
- lfind() and lsearch() in lf_hash.c had to be renamed, declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h
Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)
- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)
Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
Diffstat (limited to 'client')
-rw-r--r-- | client/mysql.cc | 2 | ||||
-rw-r--r-- | client/mysqltest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 8e40cf072cd..d33f8b186a0 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1107,7 +1107,7 @@ inline int get_command_index(char cmd_char) All client-specific commands are in the first part of commands array and have a function to implement it. */ - for (uint i= 0; *commands[i].func; i++) + for (uint i= 0; commands[i].func; i++) if (commands[i].cmd_char == cmd_char) return i; return -1; diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 9b925d6bfb8..8e8ddc8718b 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5211,7 +5211,7 @@ static st_error global_error_names[] = #include <my_base.h> static st_error handler_error_names[] = { - { "<No error>", -1U, "" }, + { "<No error>", UINT_MAX, "" }, #include <handler_ername.h> { 0, 0, 0 } }; |