summaryrefslogtreecommitdiff
path: root/innobase/include/univ.i
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-10 17:37:37 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-10 17:37:37 +0300
commitaa3c4306754c3db0c2ea3a6db0cffcb6bc1ed0f7 (patch)
tree2d9d1fce1c8c7170391a58f2fa2731f5c6a02605 /innobase/include/univ.i
parentbffebc8e0be4772e7988b6b23570bd1197c7214a (diff)
downloadmariadb-git-aa3c4306754c3db0c2ea3a6db0cffcb6bc1ed0f7.tar.gz
Portability fixes
Added record_rnd_buffer Added --safe-user-create Fix for ALTER TABLE RENAME on windows Docs/manual.texi: Changelog and documentation of new features. More information about using threaded client libraries include/mysql_com.h: Added prototype for my_thread_init() include/mysqld_error.h: New error for --safe-create-user innobase/buf/buf0flu.c: Portability fix innobase/include/univ.i: Portability fix mysql-test/t/distinct.test: Test for distinct bug sql/mysql_priv.h: Added record_rnd_buffer sql/mysqld.cc: Added record_rnd_buffer sql/records.cc: Added record_rnd_buffer sql/share/czech/errmsg.txt: New error message for --safe-user-create sql/share/danish/errmsg.txt: New error message for --safe-user-create sql/share/dutch/errmsg.txt: New error message for --safe-user-create sql/share/english/errmsg.txt: New error message for --safe-user-create sql/share/estonian/errmsg.txt: New error message for --safe-user-create sql/share/french/errmsg.txt: New error message for --safe-user-create sql/share/german/errmsg.txt: New error message for --safe-user-create sql/share/greek/errmsg.txt: New error message for --safe-user-create sql/share/hungarian/errmsg.txt: New error message for --safe-user-create sql/share/italian/errmsg.txt: New error message for --safe-user-create sql/share/japanese/errmsg.txt: New error message for --safe-user-create sql/share/korean/errmsg.txt: New error message for --safe-user-create sql/share/norwegian-ny/errmsg.txt: New error message for --safe-user-create sql/share/norwegian/errmsg.txt: New error message for --safe-user-create sql/share/polish/errmsg.txt: New error message for --safe-user-create sql/share/portuguese/errmsg.txt: New error message for --safe-user-create sql/share/romanian/errmsg.txt: New error message for --safe-user-create sql/share/russian/errmsg.txt: New error message for --safe-user-create sql/share/slovak/errmsg.txt: New error message for --safe-user-create sql/share/spanish/errmsg.txt: New error message for --safe-user-create sql/share/swedish/errmsg.txt: New error message for --safe-user-create sql/sql_acl.cc: Checking of privileges for --safe-user-create sql/sql_acl.h: --safe-user-create sql/sql_base.cc: --safe-user-create sql/sql_parse.cc: --safe-user-create sql/sql_show.cc: --safe-user-create sql/sql_table.cc: Fix for ALTER TABLE RENAME on windows
Diffstat (limited to 'innobase/include/univ.i')
-rw-r--r--innobase/include/univ.i4
1 files changed, 1 insertions, 3 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index 6ffbb1b8fef..f3e3b22bb3d 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -9,12 +9,10 @@ Created 1/20/1994 Heikki Tuuri
#ifndef univ_i
#define univ_i
-#if (defined(_WIN32) || defined(_WIN64))
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(MYSQL_SERVER)
#define __WIN__
-#ifndef MYSQL_SERVER
#include <windows.h>
-#endif
/* If you want to check for errors with compiler level -W4,
comment out the above include of windows.h and let the following defines