Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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-09-19 17:55:55-04:00, iggy@stripped +19 -0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-win
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-win
MERGE: 1.2309.5.1
BitKeeper/deleted/.del-build-vs8_x64.bat@stripped, 2006-09-19 17:55:07-04:00, iggy@stripped +0 -0
Delete: win/build-vs8_x64.bat
CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -5
Auto merged
MERGE: 1.23.1.2
extra/yassl/taocrypt/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -2
Auto merged
MERGE: 1.7.1.1
include/config-win.h@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -0
Auto merged
MERGE: 1.90.1.1
include/my_time.h@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -5
Auto merged
MERGE: 1.14.1.1
libmysqld/Makefile.am@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.100.1.2
libmysqld/examples/Makefile.am@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.35.1.1
libmysqld/lib_sql.cc@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -0
Auto merged
MERGE: 1.120.1.1
mysql-test/t/system_mysql_db_fix.test@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -3
Auto merged
MERGE: 1.23.1.1
storage/archive/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -2
Auto merged
MERGE: 1.6.1.1
storage/blackhole/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.5.1.1
storage/csv/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.5.1.1
storage/example/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.4.1.1
storage/federated/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.2.1.1
storage/innobase/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.7.1.3
storage/myisam/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -2
Auto merged
MERGE: 1.7.1.1
storage/myisammrg/CMakeLists.txt@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.7.1.1
win/Makefile.am@stripped, 2006-09-19 17:55:52-04:00, iggy@stripped +0 -1
manual merge
MERGE: 1.2.1.1
win/configure.js@stripped, 2006-09-19 17:54:53-04:00, iggy@stripped +0 -1
Auto merged
MERGE: 1.5.1.3
# 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: rolltop.ignatz42.dyndns.org
# Root: /mnt/storeage/mysql-5.1-win/RESYNC
--- 1.3/win/Makefile.am 2006-09-19 17:56:00 -04:00
+++ 1.4/win/Makefile.am 2006-09-19 17:56:00 -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
+EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README CMakeBase.include
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.101/libmysqld/Makefile.am 2006-09-19 17:56:00 -04:00
+++ 1.102/libmysqld/Makefile.am 2006-09-19 17:56:00 -04:00
@@ -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_innodb.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.24/CMakeLists.txt 2006-09-19 17:56:00 -04:00
+++ 1.25/CMakeLists.txt 2006-09-19 17:56:00 -04:00
@@ -3,56 +3,6 @@
# 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)
@@ -124,15 +74,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)
--- 1.8/storage/innobase/CMakeLists.txt 2006-09-19 17:56:00 -04:00
+++ 1.9/storage/innobase/CMakeLists.txt 2006-09-19 17:56:00 -04:00
@@ -2,7 +2,12 @@
#SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
+ include
+ handler
+ ${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/regex
+ ${CMAKE_SOURCE_DIR}/extra/yassl/include)
ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
data/data0data.c data/data0type.c
@@ -23,6 +28,7 @@
os/os0file.c os/os0proc.c os/os0sync.c os/os0thread.c
page/page0cur.c page/page0page.c
que/que0que.c
+ handler/ha_innodb.cc
read/read0read.c
rem/rem0cmp.c rem/rem0rec.c
row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c row/row0sel.c row/row0uins.c
--- 1.6/win/configure.js 2006-09-19 17:56:00 -04:00
+++ 1.7/win/configure.js 2006-09-19 17:56:00 -04:00
@@ -1,4 +1,18 @@
-// Configure.js
+/* Copyright (C) 2004-2006 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
ForReading = 1;
ForWriting = 2;
@@ -44,6 +58,26 @@
case "MYSQL_TCP_PORT":
default_port = parts[1];
break;
+ case "?":
+ WScript.Echo("syntax: configure.js [options]");
+ WScript.Echo("options:");
+ WScript.Echo(" WITH_ARCHIVE_STORAGE_ENGINE enable archive storage engine");
+ WScript.Echo(" WITH_BLACKHOLE_STORAGE_ENGINE enable blackhole storage engine");
+ WScript.Echo(" WITH_EXAMPLE_STORAGE_ENGINE enable example storage engine");
+ WScript.Echo(" WITH_FEDERATED_STORAGE_ENGINE enable federated storage engine");
+ WScript.Echo(" WITH_INNOBASE_STORAGE_ENGINE enable innobase storage engine");
+ WScript.Echo(" WITH_EMBEDDED enable build of MySQL embedded server");
+ WScript.Echo(" __NT__ enable named pipes");
+ WScript.Echo(" MYSQL_SERVER_SUFFIX=suffix Server suffix (default none)");
+ WScript.Echo(" COMPILATION_COMMENT=comment Server comment");
+ WScript.Echo(" default 'Source distribution')");
+ WScript.Echo(" MYSQL_TCP_PORT=port Server port (default 3306)");
+ WScript.Echo(" ? Show this help text");
+ break;
+ default:
+// throw new Error(1, "Invalid parameter: " + parts[0]);
+ WScript.Echo("Invalid parameter: " + parts[0]);
+ break;
}
}
@@ -74,6 +108,7 @@
{
WScript.Echo("Error: " + e.description);
}
+
function GetValue(str, key)
{
| Thread |
|---|
| • bk commit into 5.1 tree (iggy:1.2321) | Ignacio Galarza | 19 Sep |
