summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-01-11 19:42:35 +0300
committerAlexander Nozdrin <alik@sun.com>2010-01-11 19:42:35 +0300
commit5d61829b29e5e7aa1d4300fa7ca39b2d1f5f03ee (patch)
tree075b8ef8beba8e92cf57b60fa10790616e99ecd6 /include
parent724caa519d92a02760de520153261a841ee626d6 (diff)
downloadmariadb-git-5d61829b29e5e7aa1d4300fa7ca39b2d1f5f03ee.tar.gz
Backporting revision from mysql-6.0-codebase-bugfixing.
Original revision: ------------------------------------------------------------ revno: 3789.1.9 revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3 parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h committer: Sergei Golubchik <serg@mysql.com> branch nick: 6.0-codebase timestamp: Tue 2009-12-29 14:44:48 +0100 message: better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds use setenv instead of putenv ------------------------------------------------------------
Diffstat (limited to 'include')
-rw-r--r--include/config-win.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h
index f8d51165bc2..5d64261076d 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -318,9 +318,12 @@ inline ulonglong double2ulonglong(double d)
#define strcasecmp stricmp
#define strncasecmp strnicmp
-#define HAVE_SNPRINTF /* Gave link error */
+#define HAVE_SNPRINTF 1
#define snprintf _snprintf
+#define HAVE_SETENV 1
+#define setenv(VAR,VAL,X) _putenv_s(VAR,VAL)
+
#ifdef _MSC_VER
#define HAVE_LDIV /* The optimizer breaks in zortech for ldiv */
#define HAVE_ANSI_INCLUDE