into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
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.
BitKeeper/deleted/.del-MySqlManager_ia64.dsp~179439d0832c941e:
Delete: VC++Files/mysqlmanager/MySqlManager_ia64.dsp
VC++Files/mysql.dsw:
Remove MySqlManager and references to it
VC++Files/mysql_ia64.dsw:
Remove references to MySqlManager
