Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
gen_lex_hash.cc:
Added NULL error reporting parameter to handle_options
log.cc:
Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did.
mysqld.cc:
Added option_error_reporter callback function and pass that into handle_options
mysql.cc:
Added NULL as error reporter arg to the end of handle_options
Many files:
Added NULL error reporter parameter as the last paramter to handle_options
my_getopt.c:
Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
my_getopt.h:
Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback
mysqld.dsp:
Added custom build step for compiling message file and added message resource file (output of mc)
VC++Files/sql/mysqld.dsp:
Added custom build step for compiling message file and added message resource file (output of mc)
client/mysqladmin.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlcheck.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqldump.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlimport.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanager-pwgen.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlmanagerc.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlbinlog.cc:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqlshow.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysqltest.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/my_print_defaults.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_install.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/mysql_waitpid.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/perror.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/resolve_stack_dump.c:
Added NULL error reporter parameter as the last paramter to handle_options
extra/resolveip.c:
Added NULL error reporter parameter as the last paramter to handle_options
isam/isamchk.c:
Added NULL error reporter parameter as the last paramter to handle_options
isam/pack_isam.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/mi_test1.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisam_ftdump.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisamchk.c:
Added NULL error reporter parameter as the last paramter to handle_options
myisam/myisampack.c:
Added NULL error reporter parameter as the last paramter to handle_options
include/my_getopt.h:
Changed declaration of handle_options to use typedefs for the two function pointers. added second function pointer to server as an error reporting callback
mysys/my_getopt.c:
Added second function pointer to server as an error reporting callback. Added local function report_option_error that will either write the error to stderr or to the error reporting callback. changed all calls in handle_options from fprintf(stderr, ... ) to report_option_error
tools/mysqlmanager.c:
Added NULL error reporter parameter as the last paramter to handle_options
client/mysql.cc:
Added NULL as error reporter arg to the end of handle_options
sql/mysqld.cc:
Added option_error_reporter callback function and pass that into handle_options
sql/log.cc:
Add print_msg_to_log, print_buffer_to_log, and vprint_msg_to_log. Print_msg_to_log will write the message to the windows event log if on NT. We now have error, warning, and information versions of sql_print_xxxx. T his is a variation of a similar changeset WAX did.
sql/gen_lex_hash.cc:
Added NULL error reporting parameter to handle_options
sql/mysql_priv.h:
Added declarations for print_msg_to_log and vprint_msg_to_log. sql_print_error are simple functions that wrap calls to print_msg_to_log. Define the different error types with MY_ERROR_TYPE, MY_WARNING_TYPE, and MY_INFORMATION_TYPE
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
add typelib.h to filelist
Clients and Tools.fgl:
add libmysql.dll to file list
4.0.XX-gpl.ipr:
Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr:
Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
add libmysql.dll to file list
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
add typelib.h to filelist
Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)
Build-tools/mysql-copyright:
more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/innobase/innobase.dsp:
non-existent file removed
client/mysql.cc:
local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
mysql_get_parameters() interface added
#define max_allowed_packet added
include/mysql_com.h:
these should not be exported
libmysql/libmysql.c:
mysql_get_parameters implementations
libmysql/libmysql.def:
interface changed
libmysql_r/Makefile.am:
MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
interface changed
sql/log_event.cc:
should be like that in this case
tools/mysqlmanager.c:
compiler warns on this line
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld
VC++Files/dbug/dbug.dsp:
TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
using of _tls libraries added
VC++Files/myisam/myisam.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
TLS and TLS_DEBUG configurations added
include/mysql_com.h:
__declspec(dllimport) seems to be necessary when one uses .dll
on Windows
VC++Files/mysqldemb/mysqldemb.dsp:
Removed references to BDB and InnoDB from 'classic'
VC++Files/sql/mysqld.dsp:
Removed references to BDB and InnoDB from 'classic'
Update of VC++ project files.
VC++Files/mysqlmanager/childfrm.cpp:
Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp
VC++Files/mysqlmanager/childfrm.h:
Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h
VC++Files/mysqlmanager/mainfrm.cpp:
Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp
VC++Files/mysqlmanager/mainfrm.h:
Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h
VC++Files/mysqlmanager/mysqlmanager.dsp:
Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp
VC++Files/mysqlmanager/mysqlmanager.mak:
Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak
VC++Files/mysqlmanager/resource.h:
Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h
VC++Files/mysqlmanager/stdafx.cpp:
Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp
VC++Files/mysqlmanager/stdafx.h:
Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h
VC++Files/mysqlmanager/toolsql.cpp:
Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp
VC++Files/mysqlmanager/toolsql.h:
Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h
VC++Files/mysqlmanager/RES/bitmap1.bmp:
Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp
VC++Files/mysqlmanager/RES/bitmap3.bmp:
Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp
VC++Files/mysqlmanager/RES/bmp00001.bmp:
Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp
VC++Files/mysqlmanager/RES/bmp00002.bmp:
Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp
VC++Files/mysqlmanager/RES/database.bmp:
Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp
VC++Files/mysqlmanager/RES/fontd.bmp:
Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp
VC++Files/mysqlmanager/RES/fontu.bmp:
Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp
VC++Files/mysqlmanager/RES/query_ex.bmp:
Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp
VC++Files/mysqlmanager/RES/toolbar.bmp:
Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp
BUILD/compile-pentium-valgrind-max:
Use MYSQL_SERVER_SUFFIX
VC++Files/bdb/bdb.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysql.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqladmin.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqldump.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlimport.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlshow.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/copy_mysql_files.bat:
Assume we are in correct directory
VC++Files/innobase/innobase.dsp:
Use new version of MYSQL_SERVER_SUFFIX
Remove old files
VC++Files/isamchk/isamchk.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/libmysqld/libmysqld.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/my_print_defaults/my_print_defaults.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamchk/myisamchk.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamlog/myisamlog.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisampack/myisampack.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysql.dsw:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlcheck/mysqlcheck.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysys/mysys.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/pack_isam/pack_isam.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/perror/perror.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/replace/replace.dsp:
Use new version of MYSQL_SERVER_SUFFIX
VC++Files/sql/mysqld.dsp:
Use new version of MYSQL_SERVER_SUFFIX
include/my_global.h:
Added QUOTE and STRINGIFY
include/mysql_version.h.in:
New MYSQL_SERVER_SUFFIX handling
innobase/eval/eval0eval.c:
Fixed compiler warning
libmysql/libmysql.c:
Use STRINGIFY()
sql/mysqld.cc:
New MYSQL_SERVER_SUFFIX handling
sql/mysqld_suffix.h:
New MYSQL_SERVER_SUFFIX handling
sql/set_var.cc:
Use STRINGIFY()
zlib/contrib/asm386/zlibvc.dsp:
Updated for 4.0
Use %windir% instead of c:\winnt\ (Bug #3786)
Fixed wrong foreign key test in crash-me (Bug #3740)
VC++Files/libmysql/libmysql.dsp:
Use %windir% instead of c:\winnt\ (Bug #3786)
sql-bench/crash-me.sh:
Fixed wrong foreign key test (Bug #3740)
sql-bench/limits/mysql.cfg:
Updated results
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
BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c:
Delete: VC++Files/libmysqld/libmysqld.def
sql/slave.cc:
Fix to modify tmp_buf instead of buf, which is a const char *
VC++Files/innobase/innobase.dsp:
odbc0odbc.c was removed from the tree.
VC++Files/libmysql/libmysql.dsp:
strxnmov.c is needed in this module.
sql/log_event.cc:
Cast required to resolve compile error on Windows - byte * is
not equivalent to char *.
sql/opt_range.cc:
Cast to const char * required to resolve compile error on Windows.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
This should not be the product version; it must match Default.shl
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
This should not be the product version; it must match Default.shl
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
This should not be the product version; it must match Default.shl
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
VC++Files/mysys/mysys.dsp:
Added my_sync.c
configure.in:
Added testing of fsync and fdatasync
include/my_sys.h:
Added my_sync()
include/mysys_err.h:
Added my_sync()
isam/extra.c:
Added my_sync()
myisam/mi_extra.c:
Added my_sync()
myisam/mi_locking.c:
Added my_sync()
mysql-test/mysql-test-run.sh:
Added option --valgrind-all
mysys/Makefile.am:
Added my_sync.c
mysys/errors.c:
Added my_sync()
mysys/my_symlink.c:
Removed compiler warning
mysys/thr_alarm.c:
Fix for link error on windows
sql/unireg.cc:
Call my_sync() after all data is written to .frm file
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
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
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/nt_servc.cc:
Auto merged
configure.in:
Use local version
innobase/os/os0file.c:
Use local version
innobase/page/page0page.c:
Use local version
innobase/row/row0sel.c:
Use local version
innobase/row/row0vers.c:
Use local version
mysql-test/r/order_by.result:
Use local version
mysql-test/r/user_var.result:
merge with 3.23
mysql-test/t/order_by.test:
Use local version (test is already in range.test)
sql/log.cc:
Use local version
sql/share/spanish/errmsg.txt:
merge
sql/slave.cc:
Use local version
sql/sql_class.h:
Use local version
sql/sql_select.cc:
Use patch in 4.0 for range with NULL problem
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo; This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
Fix that USE_FRM works for all table types (bug 97)
VC++Files/libmysql/libmysql.dsp:
Added new source files
myisam/mi_key.c:
Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_range.c:
Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_rkey.c:
Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_search.c:
Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_test2.c:
Fixed printf statements
myisam/myisamdef.h:
Fixed problem when comparing a key for a multi-byte-character set.
myisam/sort.c:
Fixed printf statements
mysql-test/r/ctype_latin1_de.result:
New test results
mysql-test/r/join.result:
New test results
mysql-test/r/repair.result:
New test results
mysql-test/r/rpl_alter.result:
New test results
mysql-test/t/ctype_latin1_de-master.opt:
--new is needed to get 0x... strings to work properly
mysql-test/t/ctype_latin1_de.test:
New test for latin1_de
mysql-test/t/repair.test:
Test of USE_FRM and HEAP tables
sql/field.cc:
Fixed problem when comparing a key for a multi-byte-character set.
sql/item.cc:
Use 0x.... as strings if 'new' mode
sql/item.h:
Use 0x.... as strings if 'new' mode
sql/mysqld.cc:
Don't report -max on windows when InnoDB is enabled.
sql/sql_analyse.cc:
Removed unused variable
sql/sql_insert.cc:
Removed debug message
sql/sql_repl.cc:
Reset current_linfo; This could cause a hang when doing PURGE LOGS.
sql/sql_select.cc:
Fix for row numbers in EXPLAIN
sql/sql_table.cc:
Fix that USE_FRM works for all table types (without strange errors)
sql/sql_yacc.yy:
Removed compiler warnings.
Fixed wrong variable name for Windows
VC++Files/innobase/innobase.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/myisammrg/myisammrg.dsp:
Add missing files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Fixed included paths
VC++Files/mysqldemb/mysqldemb.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/mysqlserver/mysqlserver.dsp:
Don't use precompiled headers (doesn't work with samba)
VC++Files/sql/mysqld.dsp:
Fixed paths
innobase/include/univ.i:
Removed compiler warning
myisammrg/myrg_open.c:
Removed compiler warning
sql/ha_myisam.cc:
Removed compiler warning
Fixed wrong (but not dangerous) if statement
sql/ha_myisammrg.cc:
Removed compiler warning
sql/mysqld.cc:
Fixed wrong variable name for Windows
sql/sql_update.cc:
Removed not used label
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
VC++Files/client/mysqlclient.dsp:
Updated the sources files: < net.c >net_serv.cpp
VC++Files/innobase/innobase.dsp:
Added configuration for to compile all the dependencies options for the other projects.
VC++Files/libmysql/libmysql.dsp:
Modified the xcopy command for to avoid an error for waiting the confirmation of the copy
VC++Files/myisampack/myisampack.dsp:
Updated source location
VC++Files/mysql.dsw:
Added project files: the embedded static library; my_print_defaults; comp_err
VC++Files/mysqldemb/mysqldemb.dsp:
Updated flags
VC++Files/mysqlserver/mysqlserver.dsp:
Updated flags
VC++Files/pack_isam/pack_isam.dsp:
Updated source location
VC++Files/sql/mysqld.dsp:
Added UDF and updated flags
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
Docs/manual.texi:
Changelog
VC++Files/bdb/bdb.dsp:
Updated project files for 4.0.4
VC++Files/client/mysqlclient.dsp:
Updated project files for 4.0.4
VC++Files/innobase/innobase.dsp:
Updated project files for 4.0.4
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated project files for 4.0.4
VC++Files/mysys/mysys.dsp:
Updated project files for 4.0.4
VC++Files/perror/perror.dsp:
Updated project files for 4.0.4
VC++Files/sql/mysqld.dsp:
Updated project files for 4.0.4
client/mysqldump.c:
Only write short usage if one starts mysqldump without any options
include/config-win.h:
Added query cache on windows
libmysql/libmysql.def:
Removed old depricated functions from windows dll
sql/ha_innodb.cc:
Added missing defines
sql/set_var.cc:
Code cleanup
sql/sql_acl.cc:
Added error message if one can't read privilege tables
sql/sql_cache.h:
Changed some C linkage functions to C++ functions (portability fix)
sql/sql_class.cc:
Safety fix
Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.
BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9:
Delete: libmysqld/lib_load.cc
VC++Files/bdb/bdb.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysql.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqladmin.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlclient.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqldump.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlimport.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlshow.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/innobase/innobase.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqld/libmysqld.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/myTest.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/mytest.c:
Removed compiler warning for VC++
VC++Files/mysql.dsw:
Add Innodb to standard binary
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysqlcheck/mysqlcheck.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/mysys/mysys.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/pack_isam/pack_isam.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/perror/perror.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/replace/replace.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/sql/mysqld.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/test1/test1.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/thr_insert_test/thr_insert_test.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/thr_test/thr_test.dsp:
Updated VC++ dsp files from windows build machine
VC++Files/vio/vio.dsp:
Updated VC++ dsp files from windows build machine
sql/item_strfunc.cc:
Removed compiler warning on VC++
VC++Files/libmysql/libmysql.dsp:
Updated VC++ dsp files from windows build machine
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