bk commit into 5.0 tree (tsmith:1.2583) BUG#31814

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-20 16:56:12-07:00, tsmith@stripped +3 -0
  Bug #31814: Define __NT__ by default for the Win32 builds and fix the docs about it
  
  Add a new option for configure.js, DISABLE_NT_SUPPORT, which is entirely
  unsupported (but might allow someone on a non-NT system to perhaps maybe
  build and run the MySQL server, possibly).
  
  Remove the __NT__ option for configure.js, which is no longer needed.
  
  TODO:  Remove all references to __NT__ from the code, and stop pretending
  that we support pre-NT systems at all.  See WL#4151, "Remove __NT__ from
  server code".

  CMakeLists.txt@stripped, 2007-11-20 16:56:11-07:00, tsmith@stripped +2 -2
    Define __NT__ by default, unless DISABLE_NT_SUPPORT is
    specified in configuration.

  win/README@stripped, 2007-11-20 16:56:11-07:00, tsmith@stripped +1 -1
    Remove the mis-documented __NT__ configuration option, and replace it
    with DISABLE_NT_SUPPORT, which is flagged as UNSUPPORTED.

  win/configure.js@stripped, 2007-11-20 16:56:12-07:00, tsmith@stripped +1 -1
    Remove the __NT__ option, and replace it with DISABLE_NT_SUPPORT.
    We'll now define __NT__ by default, and it must be explicitly disabled
    (which is entirely unsupported, and may not even compile).

diff -Nrup a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2007-11-02 13:16:44 -06:00
+++ b/CMakeLists.txt	2007-11-20 16:56:11 -07:00
@@ -68,7 +68,7 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/suppo
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh
                ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)
 
-IF(__NT__)
+IF(NOT DISABLE_NT_SUPPORT)
   ADD_DEFINITIONS(-D__NT__)
 ENDIF(__NT__)
 
@@ -175,7 +175,7 @@ IF(EMBED_MANIFESTS)
     ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
 ENDIF(EMBED_MANIFESTS)
 
-# FIXME "debug" only needed if build type is "Debug", but
+# FIXME "dbug" only needed if build type is "Debug", but
 # CMAKE_BUILD_TYPE is not set during configure time.
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(dbug)
diff -Nrup a/win/README b/win/README
--- a/win/README	2007-08-03 07:23:23 -06:00
+++ b/win/README	2007-11-20 16:56:11 -07:00
@@ -43,7 +43,7 @@ The options right now are
     WITH_EXAMPLE_STORAGE_ENGINE
     WITH_FEDERATED_STORAGE_ENGINE
     WITH_INNOBASE_STORAGE_ENGINE
-    __NT__                               Enable named pipe support
+    DISABLE_NT_SUPPORT                   UNSUPPORTED: Attempt to build on non-NT system
     MYSQL_SERVER_SUFFIX=<suffix>         Server suffix, default none
     COMPILATION_COMMENT=<comment>        Server comment, default "Source distribution"
     MYSQL_TCP_PORT=<port>                Server port, default 3306
diff -Nrup a/win/configure.js b/win/configure.js
--- a/win/configure.js	2007-09-22 01:11:09 -06:00
+++ b/win/configure.js	2007-11-20 16:56:12 -07:00
@@ -45,7 +45,7 @@ try 
             case "WITH_EXAMPLE_STORAGE_ENGINE":
             case "WITH_FEDERATED_STORAGE_ENGINE":
             case "WITH_INNOBASE_STORAGE_ENGINE":
-            case "__NT__":
+            case "DISABLE_NT_SUPPORT":
             case "DISABLE_GRANT_OPTIONS":
             case "EMBED_MANIFESTS":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");