bk commit into 5.1 tree (georg:1.2248)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg 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, 2006-08-01 11:58:54+02:00, georg@stripped +5 -0
  Fixes for Windows 64 bit builds

  CMakeLists.txt@stripped, 2006-08-01 11:58:48+02:00, georg@stripped +3 -0
    Added backwards compatibility for using cmake 2.4

  include/config-win.h@stripped, 2006-08-01 11:58:48+02:00, georg@stripped +4 -0
    Windows 64bit fix: We can't use 32bit time_t

  include/my_time.h@stripped, 2006-08-01 11:58:48+02:00, georg@stripped +5 -0
    Windows 64-bit fix: long is still 4 bytes on Win64

  sql/handler.cc@stripped, 2006-08-01 11:58:49+02:00, georg@stripped +1 -1
    Fix for Windows 64-bit compilation error: Win64 compiler doesn't allow (byte *) == (char *)

  win/build-vs8_x64.bat@stripped, 2006-08-01 11:58:49+02:00, georg@stripped +6 -0
    New BitKeeper file ``win/build-vs8_x64.bat''

  win/build-vs8_x64.bat@stripped, 2006-08-01 11:58:49+02:00, georg@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1-sap

--- 1.90/include/config-win.h	2006-08-01 11:59:03 +02:00
+++ 1.91/include/config-win.h	2006-08-01 11:59:03 +02:00
@@ -28,6 +28,10 @@
 #define _USE_32BIT_TIME_T 1          /* force time_t to be 32 bit */
 #endif
 
+#ifdef WIN64
+#undef _USE_32BIT_TIME_T             /* no 32 bit time_t */
+#endif
+
 #include <sys/locking.h>
 #include <windows.h>
 #include <math.h>			/* Because of rint() */

--- 1.250/sql/handler.cc	2006-08-01 11:59:03 +02:00
+++ 1.251/sql/handler.cc	2006-08-01 11:59:03 +02:00
@@ -3483,7 +3483,7 @@
 {
   DBUG_ENTER("ha_reset");
   /* Check that we have called all proper delallocation functions */
-  DBUG_ASSERT((byte*) table->def_read_set.bitmap +
+  DBUG_ASSERT((char*) table->def_read_set.bitmap +
               table->s->column_bitmap_size ==
               (char*) table->def_write_set.bitmap);
   DBUG_ASSERT(bitmap_is_set_all(&table->s->all_set));
--- New file ---
+++ win/build-vs8_x64.bat	06/08/01 11:58:49
@echo off

if exist cmakecache.txt del cmakecache.txt
copy win\vs8cache.txt cmakecache.txt
cmake -G "Visual Studio 8 2005 Win64"
copy cmakecache.txt win\vs8cache.txt


--- 1.14/include/my_time.h	2006-08-01 11:59:03 +02:00
+++ 1.15/include/my_time.h	2006-08-01 11:59:03 +02:00
@@ -33,7 +33,12 @@
   Portable time_t replacement.
   Should be signed and hold seconds for 1902-2038 range.
 */
+#ifdef WIN64
+/* under Win64 long is still 4 bytes (not 8!) */
+typedef LONG64 my_time_t;
+#else
 typedef long my_time_t;
+#endif
 
 #define MY_TIME_T_MAX LONG_MAX
 #define MY_TIME_T_MIN LONG_MIN

--- 1.20/CMakeLists.txt	2006-08-01 11:59:03 +02:00
+++ 1.21/CMakeLists.txt	2006-08-01 11:59:03 +02:00
@@ -6,6 +6,9 @@
 # Hardcode support for CSV storage engine
 SET(WITH_CSV_STORAGE_ENGINE TRUE)
 
+# Set backwards compatibility for cmake downto version 2.2
+SET(CMAKE_BACKWARDS_COMPATIBILITY 2.2)
+
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)