Enable build on Windows
VC++Files/mysql.sln:
Enable build on Windows
VC++Files/libmysqld/libmysqld.vcproj:
Enable build on Windows
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
Enable build on Windows
VC++Files/myisamchk/myisamchk.vcproj:
Enable build on Windows
VC++Files/myisamlog/myisamlog.vcproj:
Enable build on Windows
VC++Files/myisampack/myisampack.vcproj:
Enable build on Windows
VC++Files/mysqldemb/mysqldemb.vcproj:
Enable build on Windows
VC++Files/mysqlserver/mysqlserver.vcproj:
Enable build on Windows
VC++Files/sql/mysqld.vcproj:
Enable build on Windows
VC++Files/storage/bdb/bdb.vcproj:
Enable build on Windows
VC++Files/storage/myisam/myisam.vcproj:
Enable build on Windows
VC++Files/storage/myisammrg/myisammrg.vcproj:
Enable build on Windows
VC++Files/strings/strings.vcproj:
Enable build on Windows
updated include directory after move to storage directory
mysql.sln:
updated locations of storage engines
myisam.vcproj:
Rename: VC++Files/myisam/myisam.vcproj -> VC++Files/storage/myisam/myisam.vcproj
heap.vcproj:
Rename: VC++Files/heap/heap.vcproj -> VC++Files/storage/heap/heap.vcproj
innobase.vcproj:
Rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj
myisammrg.vcproj:
Rename: VC++Files/myisammrg/myisammrg.vcproj -> VC++Files/storage/myisammrg/myisammrg.vcproj
bdb.vcproj:
Rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj
VC++Files/mysql.sln:
updated locations of storage engines
VC++Files/storage/bdb/bdb.vcproj:
updated include directory after move to storage directory
VC++Files/storage/heap/heap.vcproj:
updated include directory after move to storage directory
VC++Files/storage/innobase/innobase.vcproj:
updated include directory after move to storage directory
VC++Files/storage/myisam/myisam.vcproj:
updated include directory after move to storage directory
VC++Files/storage/myisammrg/myisammrg.vcproj:
updated include directory after move to storage directory
BitKeeper/etc/ignore:
auto-union
BUILD/autorun.sh:
Auto merged
BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
Auto merged
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
Auto merged
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
Auto merged
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
Auto merged
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysys/default.c:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/unireg.cc:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/buf/buf0flu.c:
Auto merged
storage/innobase/data/data0data.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/include/btr0btr.h:
Auto merged
storage/innobase/include/data0type.ic:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/dict0mem.h:
Auto merged
storage/innobase/include/mem0mem.h:
Auto merged
storage/innobase/include/mem0mem.ic:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/ut0mem.h:
Auto merged
storage/innobase/mem/mem0mem.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/os/os0proc.c:
Auto merged
storage/innobase/rem/rem0rec.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/trx/trx0sys.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/innobase/ut/ut0mem.c:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_dbug.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_delete_all.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/sp_key.c:
Auto merged
storage/myisammrg/myrg_rkey.c:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
merge
BUILD/SETUP.sh:
merge
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
SCCS merged
libmysqld/Makefile.am:
merge
sql/ha_ndbcluster.cc:
merge
sql/handler.h:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/slave.cc:
merge
sql/slave.h:
e
merge
sql/sql_parse.cc:
merge
sql/table.cc:
merge
sql/examples/ha_tina.cc:
merge
sql/examples/ha_tina.h:
merge
sql/share/errmsg.txt:
merge
storage/ndb/include/ndbapi/Ndb.hpp:
merge
storage/ndb/src/common/debugger/EventLogger.cpp:
merge
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
SCCS merged
VC++Files/mysql.sln:
updated locations of storage engines
VC++Files/sql/mysqld.vcproj:
modified some include directories for storage engines
added some new files
VC++Files/storage/bdb/bdb.vcproj:
moved storage engine under storage folder
VC++Files/storage/heap/heap.vcproj:
moved storage engine under storage folder
VC++Files/storage/innobase/innobase.vcproj:
moved storage engine under storage folder
VC++Files/storage/myisam/myisam.vcproj:
moved storage engine under storage folder
VC++Files/storage/myisammrg/myisammrg.vcproj:
moved storage engine under storage folder
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
