VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
Auto merged
VC++Files/libmysqltest/myTest.dsp:
Auto merged
VC++Files/merge/merge.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/regex/regex.dsp:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
VC++Files/test1/test1.dsp:
Auto merged
VC++Files/thr_test/thr_test.dsp:
Auto merged
VC++Files/vio/vio.dsp:
Auto merged
VC++Files/zlib/zlib.dsp:
Auto merged
extra/my_print_defaults.c:
Auto merged
include/m_string.h:
Auto merged
include/mysql_embed.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/mem/mem0pool.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
VC++Files/bdb/bdb.dsp:
Merge with 4.0
VC++Files/client/mysql.dsp:
Merge with 4.0
VC++Files/client/mysqlclient.dsp:
Merge with 4.0
VC++Files/comp_err/comp_err.dsp:
Merge with 4.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Merge with 4.0
VC++Files/libmysqld/libmysqld.dsp:
Merge with 4.0
VC++Files/myisamchk/myisamchk.dsp:
Merge with 4.0
VC++Files/myisamlog/myisamlog.dsp:
Merge with 4.0
VC++Files/myisampack/myisampack.dsp:
Merge with 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
Merge with 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
Merge with 4.0
VC++Files/sql/mysqld.dsp:
Merge with 4.0
VC++Files/strings/strings.dsp:
Merge with 4.0
libmysqld/lib_sql.cc:
Merge with 4.0
libmysqld/libmysqld.def:
Merge with 4.0
mysql-test/r/func_str.result:
Merge with 4.0
mysql-test/r/handler.result:
auto
mysql-test/r/variables.result:
Merge with 4.0
mysql-test/t/func_str.test:
auto
mysql-test/t/handler.test:
auto
mysql-test/t/variables.test:
Merge with 4.0
scripts/make_win_src_distribution.sh:
auto
scripts/mysql_install_db.sh:
Use original file
sql/Makefile.am:
Merge with 4.0
sql/ha_innodb.cc:
auto
sql/item_strfunc.cc:
Merge with 4.0
sql/mysql_priv.h:
auto
sql/mysqld.cc:
Merge with 4.0
sql/set_var.cc:
Merge with 4.0
sql/slave.cc:
auto
sql/sql_class.h:
auto
sql/sql_handler.cc:
Merge with 4.0
strings/ctype-tis620.c:
Merge with 4.0
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
VC++Files/bdb/bdb.dsp:
Small, automatic changes
VC++Files/client/mysql.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
Automatic changes
VC++Files/dbug/dbug.dsp:
Automatic changes
VC++Files/heap/heap.dsp:
automatic changes
VC++Files/innobase/innobase.dsp:
Automatic changes
VC++Files/isam/isam.dsp:
Automatic changes
VC++Files/isamchk/isamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Add missing files
VC++Files/libmysqld/libmysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
Automatic changes
VC++Files/merge/merge.dsp:
Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
automatic changes
VC++Files/myisamchk/myisamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
Automatic changes
VC++Files/mysys/mysys.dsp:
Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
Automatic changes
VC++Files/replace/replace.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
Automatic changes
VC++Files/thr_test/thr_test.dsp:
Automatic changes
VC++Files/vio/vio.dsp:
Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
Automatic changes
VC++Files/zlib/zlib.dsp:
Automatic changes
extra/my_print_defaults.c:
Fixed bug in --verbose
include/m_string.h:
Portability fix
include/mysql_embed.h:
Better setting of server_version variable
include/mysql_version.h.in:
Better license text handling
innobase/pars/pars0lex.l:
Remove compiler warnings
innobase/trx/trx0sys.c:
Remove compiler warnings
libmysqld/lib_sql.cc:
Better setting of server_version variable
libmysqld/libmysqld.def:
Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
Remove compiler warnings
mysys/sha1.c:
Remove compiler warnings
scripts/make_win_src_distribution.sh:
Safety fix
scripts/mysql_install_db.sh:
Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
Add new file mysqld_suffix.h
Remove not used file sql_olap.h
sql/ha_innodb.cc:
Remove not used variable
sql/mysqld.cc:
Better setting of server_version variable
sql/set_var.cc:
Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
Remove compiler warnings
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
VC++Files/client/mysql.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/comp_err/comp_err.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/innobase/innobase.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamchk/myisamchk.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamlog/myisamlog.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisampack/myisampack.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysys/mysys.dsp:
Updated project files for windows according to suggestions from Intel
libmysql/libmysql.c:
Removed not used include files (which caused problems on Win64)
mysql-test/r/rpl_change_master.result:
Made test portable
mysql-test/t/rpl_change_master.test:
Made test portable
sql-common/client.c:
Removed not used include files (which caused problems on Win64)
sql/ha_innodb.cc:
Ensure that mutex is not freed if not initilized
sql/hostname.cc:
Ensure that mutex is not freed if not initilized
sql/slave.cc:
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
BitKeeper/etc/logging_ok:
auto-union
mytest-old.c:
Merge rename: VC++Files/libmysqltest/mytest.c -> mytest-old.c
BitKeeper/deleted/.del-mysqlshutdown.c:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.rc:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlwatch.c:
Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-thr_test.c:
Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-make_win_src_distribution.sh:
Delete: scripts/make_win_src_distribution.sh
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
Auto merged
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
Auto merged
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
Auto merged
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
Auto merged
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
Auto merged
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
Auto merged
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
Auto merged
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
Auto merged
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
Auto merged
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
Auto merged
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
Auto merged
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
Auto merged
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
Auto merged
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
Auto merged
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
Auto merged
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
Auto merged
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
Auto merged
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
Auto merged
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
Auto merged
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
Auto merged
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
Auto merged
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
Auto merged
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
Auto merged
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
Auto merged
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
Auto merged
configure.in:
Merge with 3.23.58 (Keep old code)
sql/slave.cc:
Merge with 3.23.58 (Keep old code)
sql/sql_parse.cc:
Merge with 3.23.58 (Keep old code)
Fix unlock error in myisamchk on windows when doing --sort-index
Use SetFilePointer instead of SetFilePointerEx
VC++Files/client/mysql.dsp:
Update of project files
VC++Files/client/mysqladmin.dsp:
Update of project files
VC++Files/client/mysqlclient.dsp:
Update of project files
VC++Files/client/mysqldump.dsp:
Update of project files
VC++Files/client/mysqlimport.dsp:
Update of project files
VC++Files/client/mysqlshow.dsp:
Update of project files
VC++Files/comp_err/comp_err.dsp:
Update of project files
VC++Files/innobase/innobase.dsp:
Update of project files
VC++Files/isamchk/isamchk.dsp:
Update of project files
VC++Files/libmysql/libmysql.dsp:
Update of project files
VC++Files/libmysqld/libmysqld.dsp:
Update of project files
VC++Files/libmysqltest/myTest.dsp:
Update of project files
VC++Files/my_print_defaults/my_print_defaults.dsp:
Update of project files
VC++Files/myisamlog/myisamlog.dsp:
Update of project files
VC++Files/mysql.dsw:
Update of project files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Update of project files
VC++Files/mysqlcheck/mysqlcheck.dsp:
Update of project files
VC++Files/mysqldemb/mysqldemb.dsp:
Update of project files
VC++Files/mysqlmanager/MySqlManager.dsp:
Update of project files
VC++Files/mysqlserver/mysqlserver.dsp:
Update of project files
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Update of project files
VC++Files/mysys/mysys.dsp:
Update of project files
VC++Files/pack_isam/pack_isam.dsp:
Update of project files
VC++Files/perror/perror.dsp:
Update of project files
VC++Files/replace/replace.dsp:
Update of project files
VC++Files/sql/mysqld.dsp:
Update of project files
VC++Files/test1/test1.dsp:
Update of project files
VC++Files/thr_test/thr_test.dsp:
Update of project files
VC++Files/vio/vio.dsp:
Update of project files
VC++Files/zlib/zlib.dsp:
Update of project files
myisam/mi_check.c:
Fix unlock error in myisamchk on windows when doing --sort-index
myisam/mi_locking.c:
Fix unlock error in myisamchk on windows when doing --sort-index
myisam/myisamchk.c:
New comment
mysys/my_chsize.c:
Use SetFilePointer instead of SetFilePointerEx, as the first is more portable
sql/handler.cc:
Fix compiler warning
sql/log_event.cc:
Fix compiler warning
Docs/bk.txt:
instructions for compiling for Win via samba
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
add some options
VC++Files/mysys/mysys.dsp:
add some options
Portability fixes.
Removed compiler warnings.
VC++Files/client/mysql.dsp:
Updated to 4.0.2
VC++Files/client/mysqladmin.dsp:
Updated to 4.0.2
VC++Files/client/mysqlclient.dsp:
Updated to 4.0.2
VC++Files/client/mysqldump.dsp:
Updated to 4.0.2
VC++Files/client/mysqlimport.dsp:
Updated to 4.0.2
VC++Files/client/mysqlshow.dsp:
Updated to 4.0.2
VC++Files/innobase/innobase.dsp:
Updated to 4.0.2
VC++Files/libmysql/libmySQL.dsp:
Updated to 4.0.2
VC++Files/libmysqltest/myTest.dsp:
Updated to 4.0.2
VC++Files/merge/merge.dsp:
Updated to 4.0.2
VC++Files/myisam/myisam.dsp:
Updated to 4.0.2
VC++Files/mysql.dsw:
Updated to 4.0.2
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated to 4.0.2
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated to 4.0.2
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated to 4.0.2
VC++Files/mysys/mysys.dsp:
Updated to 4.0.2
VC++Files/pack_isam/pack_isam.dsp:
Updated to 4.0.2
VC++Files/perror/perror.dsp:
Updated to 4.0.2
VC++Files/replace/replace.dsp:
Updated to 4.0.2
VC++Files/sql/mysqld.dsp:
Updated to 4.0.2
VC++Files/test1/test1.dsp:
Updated to 4.0.2
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated to 4.0.2
VC++Files/thr_test/thr_test.dsp:
Updated to 4.0.2
VC++Files/vio/vio.dsp:
Updated to 4.0.2
VC++Files/zlib/zlib.dsp:
Updated to 4.0.2
include/config-win.h:
Added isnan() and finite()
include/myisam.h:
Move thr_xxx functions to myisam_priv.h
myisam/mi_check.c:
Portability fix.
myisam/mi_locking.c:
Comment cleanup
myisam/myisamchk.c:
Removed compiler warning
myisam/myisamdef.h:
Added thr_xxx functions
myisam/sort.c:
Portability fix
sql/field.cc:
Portability fix
sql/sql_insert.cc:
R
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown