bk commit into 5.1 tree (iggy:1.2314)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of Administrator. When Administrator 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-10-23 11:26:14-04:00, iggy@amd64. +9 -0
  Merge bk-internal:/home/bk/mysql-5.1-win
  into  amd64.:D:/src/mysql-5.1-win
  MERGE: 1.2273.49.7

  CMakeLists.txt@stripped, 2006-10-23 11:26:02-04:00, iggy@amd64. +53 -8
    MERGE: 1.23.2.1

  extra/yassl/taocrypt/CMakeLists.txt@stripped, 2006-10-23 10:38:20-04:00, iggy@amd64. +0 -0
    Auto merged
    MERGE: 1.7.2.1

  include/config-win.h@stripped, 2006-10-23 10:38:20-04:00, iggy@amd64. +0 -0
    Auto merged
    MERGE: 1.90.2.2

  include/my_time.h@stripped, 2006-10-23 10:38:20-04:00, iggy@amd64. +0 -5
    Auto merged
    MERGE: 1.14.2.1

  libmysqld/Makefile.am@stripped, 2006-10-23 10:38:20-04:00, iggy@amd64. +0 -0
    Auto merged
    MERGE: 1.94.1.8

  mysql-test/mysql-test-run.pl@stripped, 2006-10-23 10:38:21-04:00, iggy@amd64. +0 -0
    Auto merged
    MERGE: 1.166.1.1

  mysql-test/t/system_mysql_db_fix.test@stripped, 2006-10-23 10:38:21-04:00, iggy@amd64. +0 -0
    Auto merged
    MERGE: 1.23.1.2

  sql/CMakeLists.txt@stripped, 2006-10-23 11:26:05-04:00, iggy@amd64. +53 -15
    MERGE: 1.23.3.4

  win/Makefile.am@stripped, 2006-10-23 11:26:06-04:00, iggy@amd64. +0 -1
    MERGE: 1.2.2.1

# 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:	iggy
# Host:	amd64.
# Root:	D:/src/mysql-5.1-win/RESYNC

--- 1.92/include/config-win.h	2006-10-23 11:26:25 -04:00
+++ 1.93/include/config-win.h	2006-10-23 11:26:25 -04:00
@@ -116,8 +116,14 @@
 #define ULL(A)          ((unsigned __int64) A)
 #endif
 
+/* special fix for ICC Win64 compiler bug in log_event.h */
+#if defined(__INTEL_COMPILER) && (defined(_WIN64) || defined(WIN64))
+#define LONGLONG_MIN	(__int64)(0x8000000000000000)
+#define LONGLONG_MAX	(__int64)(0x7FFFFFFFFFFFFFFF)
+#else
 #define LONGLONG_MIN	LL(0x8000000000000000)
 #define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)
+#endif
 #define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)
 
 /* Type information */

--- 1.191/mysql-test/mysql-test-run.pl	2006-10-23 11:26:25 -04:00
+++ 1.192/mysql-test/mysql-test-run.pl	2006-10-23 11:26:25 -04:00
@@ -1219,7 +1219,9 @@
     if ( $glob_use_embedded_server )
     {
       my $path_examples= "$glob_basedir/libmysqld/examples";
-      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest_embedded");
+      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest_embedded",
+                                        "$path_examples/release/mysqltest_embedded",
+                                        "$path_examples/debug/mysqltest_embedded");
       $exe_mysql_client_test=
         mtr_exe_exists("$path_examples/mysql_client_test_embedded",
 		       "/usr/bin/false");

--- 1.4/win/Makefile.am	2006-10-23 11:26:25 -04:00
+++ 1.5/win/Makefile.am	2006-10-23 11:26:25 -04:00
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to create Makefile.in
-EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README
CMakeBase.include
+EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.98/libmysqld/Makefile.am	2006-10-23 11:26:25 -04:00
+++ 1.99/libmysqld/Makefile.am	2006-10-23 11:26:25 -04:00
@@ -22,7 +22,7 @@
 MYSQLBASEdir=		$(prefix)
 MYSQLLIBdir=            $(libdir)
 
-EXTRA_DIST =		libmysqld.def
+EXTRA_DIST =		libmysqld.def CMakeLists.txt
 DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
@@ -44,7 +44,7 @@
 noinst_HEADERS =	embedded_priv.h emb_qcache.h
 
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
-	     ha_ndbcluster.cc \
+	ha_ndbcluster.cc \
 	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \

--- 1.25/CMakeLists.txt	2006-10-23 11:26:25 -04:00
+++ 1.26/CMakeLists.txt	2006-10-23 11:26:25 -04:00
@@ -3,6 +3,56 @@
 # This reads user configuration, generated by configure.js.
 INCLUDE(win/configure.data)
 
+# Hardcode support for CSV storage engine
+SET(WITH_CSV_STORAGE_ENGINE TRUE)
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
+               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
+
+SET(WITH_HEAP_STORAGE_ENGINE TRUE)
+ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)
+SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")
+
+SET(WITH_MYISAM_STORAGE_ENGINE TRUE)
+ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
+SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")
+
+SET(WITH_MYISAMMRG_STORAGE_ENGINE TRUE)
+ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)
+SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")
+
+IF(WITH_ARCHIVE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_archive_plugin")
+ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
+IF(WITH_BLACKHOLE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_blackhole_plugin")
+ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
+IF(WITH_CSV_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_CSV_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_csv_plugin")
+ENDIF(WITH_CSV_STORAGE_ENGINE)
+IF(WITH_EXAMPLE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_example_plugin")
+ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_INNOBASE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_PARTITION_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_partition_plugin")
+ENDIF(WITH_PARTITION_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in 
+               ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)
+
 SET(localstatedir "C:\\mysql\\data")
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh
                ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)
@@ -74,15 +124,15 @@
 ADD_SUBDIRECTORY(storage/myisam)
 ADD_SUBDIRECTORY(storage/myisammrg)
 ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(storage/csv)
-
-# storage engines
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/archive)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
 IF(WITH_BLACKHOLE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/blackhole)
 ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
+IF(WITH_CSV_STORAGE_ENGINE)
+  ADD_SUBDIRECTORY(storage/csv)
+ENDIF(WITH_CSV_STORAGE_ENGINE)
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
@@ -96,8 +146,7 @@
 ADD_SUBDIRECTORY(server-tools/instance-manager)
 ADD_SUBDIRECTORY(libmysql)
 ADD_SUBDIRECTORY(tests)
-IF(WITH_EMBEDDED)
-  ADD_SUBDIRECTORY(libmysqld)
-  ADD_SUBDIRECTORY(libmysqld/examples)
-ENDIF(WITH_EMBEDDED)
 
+# disable libmysqld until it's fixed, so we can use Cmake 2.2 and 2.4
+#ADD_SUBDIRECTORY(libmysqld)
+#ADD_SUBDIRECTORY(libmysqld/examples)

--- 1.9/extra/yassl/taocrypt/CMakeLists.txt	2006-10-23 11:26:25 -04:00
+++ 1.10/extra/yassl/taocrypt/CMakeLists.txt	2006-10-23 11:26:25 -04:00
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(../mySTL include)
+INCLUDE_DIRECTORIES(mySTL include)
 
 ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp
src/asn.cpp src/coding.cpp 
 				src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp
src/md2.cpp