summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-08-14 14:45:48 -0700
committerunknown <brian@zim.(none)>2006-08-14 14:45:48 -0700
commitcd066443944c3baa65b5b033e43f583e9aab1b7e (patch)
tree94f980737df52249aeba04b861e3511e3766b96f /win
parent03830dd6097d462d1a680e6ced7cfa94ae65db07 (diff)
downloadmariadb-git-cd066443944c3baa65b5b033e43f583e9aab1b7e.tar.gz
Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
libmysqld/CMakeLists.txt: Fix for build for BDB mysys/base64.c: Removed warning mysys/my_pread.c: Removed warning sql-common/my_time.c: Removed Warning sql/CMakeLists.txt: Editing for BDB storage/csv/ha_tina.cc: Removed warning storage/myisam/ft_parser.c: Removed warning storage/myisam/mi_delete_all.c: Removed unused variable storage/myisam/mi_packrec.c: Removed unused variable win/README: Fixed docs on Windows BDB win/configure.js: Removed function call to add support for building BDB
Diffstat (limited to 'win')
-rw-r--r--win/README1
-rw-r--r--win/configure.js32
2 files changed, 0 insertions, 33 deletions
diff --git a/win/README b/win/README
index 4aab39575e0..d1092c3e969 100644
--- a/win/README
+++ b/win/README
@@ -39,7 +39,6 @@ The options right now are
WITH_INNOBASE_STORAGE_ENGINE Enable particular storage engines
WITH_PARTITION_STORAGE_ENGINE
WITH_ARCHIVE_STORAGE_ENGINE
- WITH_BERKELEY_STORAGE_ENGINE
WITH_BLACKHOLE_STORAGE_ENGINE
WITH_EXAMPLE_STORAGE_ENGINE
WITH_FEDERATED_STORAGE_ENGINE
diff --git a/win/configure.js b/win/configure.js
index ef90ce982a6..6f09be01b6e 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -24,7 +24,6 @@ try
switch (parts[0])
{
case "WITH_ARCHIVE_STORAGE_ENGINE":
- case "WITH_BERKELEY_STORAGE_ENGINE":
case "WITH_BLACKHOLE_STORAGE_ENGINE":
case "WITH_EXAMPLE_STORAGE_ENGINE":
case "WITH_FEDERATED_STORAGE_ENGINE":
@@ -66,8 +65,6 @@ try
configfile.Close();
- //ConfigureBDB();
-
fso = null;
WScript.Echo("done!");
@@ -135,32 +132,3 @@ function GetVersionId(version)
id += build;
return id;
}
-
-function ConfigureBDB()
-{
- // read in the Unix configure.in file
- var dbIncTS = fso.OpenTextFile("..\\bdb\\dbinc\\db.in", ForReading);
- var dbIn = dbIncTS.ReadAll();
- dbIncTS.Close();
-
- dbIn = dbIn.replace("@DB_VERSION_MAJOR@", "$DB_VERSION_MAJOR");
- dbIn = dbIn.replace("@DB_VERSION_MINOR@", "$DB_VERSION_MINOR");
- dbIn = dbIn.replace("@DB_VERSION_PATCH@", "$DB_VERSION_PATCH");
- dbIn = dbIn.replace("@DB_VERSION_STRING@", "$DB_VERSION_STRING");
-
- dbIn = dbIn.replace("@u_int8_decl@", "typedef unsigned char u_int8_t;");
- dbIn = dbIn.replace("@int16_decl@", "typedef short int16_t;");
- dbIn = dbIn.replace("@u_int16_decl@", "typedef unsigned short u_int16_t;");
- dbIn = dbIn.replace("@int32_decl@", "typedef int int32_t;");
- dbIn = dbIn.replace("@u_int32_decl@", "typedef unsigned int u_int32_t;");
-
- dbIn = dbIn.replace("@u_char_decl@", "{\r\n#if !defined(_WINSOCKAPI_)\r\n" +
- "typedef unsigned char u_char;");
- dbIn = dbIn.replace("@u_short_decl@", "typedef unsigned short u_short;");
- dbIn = dbIn.replace("@u_int_decl@", "typedef unsigned int u_int;");
- dbIn = dbIn.replace("@u_long_decl@", "typedef unsigned long u_long;");
-
- dbIn = dbIn.replace("@ssize_t_decl@", "#endif\r\n#if defined(_WIN64)\r\n" +
- "typedef __int64 ssize_t;\r\n#else\r\n" +
- "typedef int ssize_t;\r\n#endif");
-}