into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/mysqld.cc:
Auto merged
strings/Makefile.am:
Auto merged
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
Delete: mysys/my_tempnam.c
VC++Files/client/mysqlclient.dsp:
Remove not used file my_tempnam.c
VC++Files/client/mysqlclient_ia64.dsp:
Remove not used file my_tempnam.c
VC++Files/libmysql/libmysql.dsp:
Remove not used file my_tempnam.c
VC++Files/libmysql/libmysql_ia64.dsp:
Remove not used file my_tempnam.c
VC++Files/mysys/mysys.dsp:
Remove not used file my_tempnam.c
VC++Files/mysys/mysys_ia64.dsp:
Remove not used file my_tempnam.c
client/mysql.cc:
Change to use get_defaults_options()
Remove compiler warnings
client/mysqldump.c:
Indentation fixes
Use quoted table name for 'primary_key_fields'
extra/my_print_defaults.c:
Add support for --defaults-group-suffix
change to use get_default_options()
extra/replace.c:
Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c
include/config-win.h:
Added DEFAULT_GROUP_SUFFIX_ENV
include/my_sys.h:
Change defaults_instance -> defaults_group_suffix
Change get_defaults_files -> get_defaults_options
libmysql/Makefile.shared:
Added DEFAULT_GROUP_SUFFIX_ENV
mysys/Makefile.am:
Added DEFAULT_GROUP_SUFFIX_ENV
Remove my_tempnam.c
mysys/default.c:
Changed --instance to --defaults-group-suffix
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am
(mysys shouldn't by MySQL independent)
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
mysys/default_modify.c:
Optimized code to use allocated space more efficently
Reduce code size
Ensure that realloc() works independent of argument size
mysys/my_bitmap.c:
Added missing return
sql/ha_innodb.cc:
Change if( -> if (
sql/ha_ndbcluster.cc:
Change while( -> while (
sql/item_cmpfunc.cc:
Break loop early (simple optimization)
sql/item_strfunc.cc:
Change if( -> if (
sql/log.cc:
Fixed comment
sql/mysqld.cc:
Change if( -> if (
sql/opt_range.cc:
while( -> while (
if( -> if (
sql/parse_file.cc:
Change if( -> if (
sql/sql_cache.cc:
while( -> while (
sql/sql_parse.cc:
Change if( -> if (
sql/sql_prepare.cc:
Added comment
sql/sql_select.cc:
while( -> while (
Removed index variable by incrementing pointer
sql/sql_show.cc:
Change if( -> if (
sql/sql_yacc.yy:
Change if( -> if (
tests/mysql_client_test.c:
Added cast to first argument to bzero()
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)
strings/conf_to_src.c:
if malloc() fails, just abort
VC++Files/client/mysqlclient.dsp:
Add str_alloc.c
VC++Files/client/mysqlclient_ia64.dsp:
Add str_alloc.c
VC++Files/libmysql/libmysql.dsp:
Add str_alloc.c
VC++Files/libmysql/libmysql_ia64.dsp:
Add str_alloc.c
VC++Files/libmysqld/libmysqld.dsp:
Add str_alloc.c
VC++Files/libmysqld/libmysqld_ia64.dsp:
Add str_alloc.c
VC++Files/strings/backup/strings.dsp:
Add str_alloc.c
VC++Files/strings/noMASM/strings.dsp:
Add str_alloc.c
VC++Files/strings/strings.dsp:
Add str_alloc.c
VC++Files/strings/strings_ia64.dsp:
Add str_alloc.c
include/m_string.h:
Add my_str_malloc/free function pointers.
libmysql/Makefile.shared:
Add str_alloc.lo
sql/mysqld.cc:
Reassign my_str_malloc/free pointers so they use my_malloc/free
strings/Makefile.am:
Add str_alloc.c
strings/ctype-tis620.c:
Use my_str_malloc/free
Enabled yaSSL on Windows
Many files:
Added yaSSL to Visual Studio 6 project files
VC++Files/mysql.dsw:
Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqlclient.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/sql/mysqld.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/vio/vio.dsp:
Added yaSSL to Visual Studio 6 project files
include/config-win.h:
Enabled yaSSL on Windows
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
- fixed linking with zlib
VC++Files/client/mysql.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysql_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlclient.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqlclient_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqldump.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqldump_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/libmysql/libmysql.dsp:
- added ctype-cp932.c to the file list
VC++Files/libmysql/libmysql_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/mysql-test/mysql_test_run_new.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
- added zlib.lib to the LINK32 options
VC++Files/strings/strings_ia64.dsp:
- added ctype-cp932.c to the file list
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/client/mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/libmysql/libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
client/mysql.cc:
Removed unused variable 'field' from print_warnings()
mysys/default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
VC++Files/client/mysqlclient.dsp:
Add new character sets
VC++Files/client/mysqlclient_ia64.dsp:
Add new character sets
VC++Files/libmysql/libmysql.dsp:
Add new character sets
VC++Files/libmysql/libmysql_ia64.dsp:
Add new character sets
VC++Files/strings/strings.dsp:
Add new character sets
VC++Files/strings/strings_ia64.dsp:
Add new character sets
include/config-win.h:
Add new character sets
Moved include <assert.h> to my_global.h
VC++Files/client/mysqlclient.dsp:
Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
Moved include <assert.h> to my_global.h
Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
Added assert.h as this is included in a lot of places
sql/sql_table.cc:
Initialize forgotten variable
Added new windows configuration
VC++Files/client/mysqlclient.dsp:
Added new configuration
VC++Files/zlib/zlib.dsp:
Added new configuration
libmysql/libmysql.c:
Moved check function from libmysql.c to client.c
sql-common/client.c:
Moved check function from libmysql.c to client.c
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
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
that was accidently added by the last BK auto merge
VC++Files/client/mysqlclient.dsp:
- removed duplicate file ..\strings\strxnmov.c that was added by the
last auto merge
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
Delete: VC++Files/libmysql/libmysql.def
VC++Files/client/mysqlclient.dsp:
Add strtod.c to get rid of linker errors
VC++Files/mysql.dsw:
Add dependency on mysys for batch build
Fixed wrong test of database name (affected optimization of ORDER BY)
VC++Files/client/mysqlclient.dsp:
Add my_file.c
VC++Files/mysys/mysys.dsp:
Add my_file.c
mysql-test/r/negation_elimination.result:
Fix wrong test
sql-common/client.c:
After merge fix
sql/sql_base.cc:
Fixed testing of database name
Fixed compiler warnings (IRIX C compiler and VC++)
VC++Files/client/mysqlclient.dsp:
Add missing file to project
VC++Files/libmysql/libmysql.dsp:
Add missing file to project
VC++Files/myisam/myisam.dsp:
Add missing file to project
VC++Files/mysys/mysys.dsp:
Add missing file to project
heap/hp_test1.c:
Fixed wrong call to heap_rkey()
heap/hp_test2.c:
Fixed wrong call to heap_rkey()
include/hash.h:
Move not used (internal) struct to hash.c
include/my_pthread.h:
Made some structs 'const char*' to avoid warnings
include/my_sys.h:
Moved key cache structs and functions to keycache.h
include/myisam.h:
Merge key cache structures to one
include/mysql.h:
Remove STDCALL from internal functions
include/sql_common.h:
Remove STDCALL from internal functions
include/violite.h:
Fixed compiler warning
isam/_locking.c:
Merge key cache structures to one
isam/_page.c:
Merge key cache structures to one
isam/close.c:
Merge key cache structures to one
isam/extra.c:
Merge key cache structures to one
isam/isamchk.c:
Merge key cache structures to one
isam/isamdef.h:
Merge key cache structures to one
isam/isamlog.c:
Merge key cache structures to one
isam/panic.c:
Merge key cache structures to one
isam/test2.c:
Merge key cache structures to one
isam/test3.c:
Merge key cache structures to one
libmysql/client_settings.h:
Remove STDCALL from internal functions
libmysql/libmysql.c:
Remove STDCALL from internal functions
myisam/ft_boolean_search.c:
Fixed compiler warning
myisam/ft_dump.c:
Fixed compiler warnings (%qx is not portable)
myisam/ft_update.c:
Fixed compiler warnings
myisam/mi_check.c:
Merge key cache structures to one
myisam/mi_close.c:
Merge key cache structures to one
myisam/mi_delete_all.c:
Merge key cache structures to one
myisam/mi_extra.c:
Merge key cache structures to one
myisam/mi_keycache.c:
Merge key cache structures to one
myisam/mi_locking.c:
Merge key cache structures to one
myisam/mi_page.c:
Merge key cache structures to one
myisam/mi_panic.c:
Merge key cache structures to one
myisam/mi_preload.c:
Merge key cache structures to one
myisam/mi_test1.c:
Merge key cache structures to one
myisam/mi_test2.c:
Merge key cache structures to one
myisam/mi_test3.c:
Merge key cache structures to one
myisam/myisamchk.c:
Merge key cache structures to one
myisam/myisamdef.h:
Merge key cache structures to one
myisam/myisamlog.c:
Merge key cache structures to one
Removed not used option
myisam/sort.c:
Fixed compiler warnings
myisam/sp_test.c:
Fixed compiler warnings
mysql-test/r/case.result:
Updated results after fix of correct NULL detection in WHEN
mysql-test/r/date_formats.result:
Updated results after fixing date handling
mysql-test/r/symlink.result:
Updated results after adding DEFAULT CHARSET
mysql-test/t/case.test:
New test
mysql-test/t/symlink.test:
Updated error numbers
mysys/hash.c:
Made HASH_LINK struct local
mysys/mf_keycache.c:
Merge key cache structures to one
Fixed key_cache_read() and key_cache_write() to be resize-safe.
mysys/mf_keycaches.c:
Merge key cache structures to one
mysys/thr_mutex.c:
Added test if mutex is initalized
sql-common/client.c:
Remove STDCALL from internal functions
sql/derror.cc:
Added comment
sql/field.cc:
Removed not used variables
sql/ha_innodb.cc:
Fixed compiler warnings (removed not used variables)
sql/ha_myisam.cc:
Merge key cache structures to one
sql/ha_myisammrg.cc:
Removed not used variables
sql/handler.cc:
Merge key cache structures to one
sql/handler.h:
Merge key cache structures to one
sql/item.cc:
Fixed compiler warning
sql/item_cmpfunc.cc:
Remove not used variables
sql/item_func.cc:
Remove not used variables
sql/item_strfunc.cc:
Removed not used variables
sql/item_sum.cc:
Removed not used variables
Moved setting of item_thd to fix_fields()
sql/item_timefunc.cc:
Removed not used variables
sql/mysql_priv.h:
Merge key cache structures to one
sql/mysqld.cc:
Merge key cache structures to one
init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used
sql/opt_sum.cc:
Remove not used variables
sql/protocol.cc:
Don't send errors after ok has been sent
sql/protocol_cursor.cc:
Remove not used variable
Simple optimization
sql/repl_failsafe.cc:
Remove not used variables
sql/set_var.cc:
Merge key cache structures to one
sql/set_var.h:
Merge key cache structures to one
sql/sql_acl.cc:
Remove not used variables
sql/sql_base.cc:
Remove not used function
sql/sql_db.cc:
Remove not used variables
sql/sql_handler.cc:
Remove not used variables
sql/sql_insert.cc:
More DBUG statements
Simple code cleanup
sql/sql_lex.cc:
Remove not used variables
sql/sql_parse.cc:
Remove not used variables
sql/sql_prepare.cc:
Remove not used variables
sql/sql_repl.cc:
Remove not used variables
sql/sql_select.cc:
Remove not used variables
sql/sql_show.cc:
Remove not used variables
sql/sql_table.cc:
Merge key cache structures to one
Removed not used variables
sql/sql_test.cc:
Merge key cache structures to one
sql/strfunc.cc:
Fixed that find_type() returns correct value for partly matched words.
(This fixed the error found by date_formats.test)
sql/time.cc:
Remove not used variables
strings/my_strtoll10.c:
Fixed compiler warnings
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
Auto merged
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
Auto merged
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
SSL/cacert.pem:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
SSL/client-cert.pem:
Auto merged
SSL/client-key.pem:
Auto merged
SSL/server-cert.pem:
Auto merged
SSL/server-key.pem:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqlclient.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/comp_err/comp_err.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysqltest/myTest.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.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/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
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/resolveip.c:
Auto merged
include/m_string.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/os/os0file.c:
Auto merged
isam/_search.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/openssl_1.result:
Auto merged
mysql-test/r/packet.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select_safe.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/openssl_1.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_uniq.h:
Auto merged
sql/log_event.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_update.cc:
Auto merged
vio/Makefile.am:
Auto merged
vio/vio.c:
Auto merged
mysql-test/t/myisam.test:
merge with 4.0.15
Extra tests
mysys/mf_keycache.c:
Keep local file
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
Updated VC++ files
VC++Files/client/mysql.dsp:
Update of VC++ files
VC++Files/client/mysqlclient.dsp:
Update of VC++ files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update of VC++ files
VC++Files/libmysqld/libmysqld.def:
Update of VC++ files
VC++Files/libmysqld/libmysqld.dsp:
Update of VC++ files
VC++Files/myisam/myisam.dsp:
Update of VC++ files
VC++Files/mysql.dsw:
Update of VC++ files
VC++Files/sql/mysqld.dsp:
Update of VC++ files
include/mysql.h:
Add missing client functions to embedded server
libmysql/libmysql.def:
sort functions to enable comparison with libmysqld.def
libmysqld/libmysqld.c:
Add missing client functions to embedded server
libmysqld/libmysqld.def:
sort functions to enable comparison with libmysql.def
Added missing functions
myisam/mi_preload.c:
Fixed compiler warning.
Small code cleanup
scripts/make_win_src_distribution.sh:
Fixed typo
Don't run zip in verbose mode
scripts/mysql_create_system_tables.sh:
Change so that localhost has full access (to make this like 4.0)
scripts/mysql_fix_privilege_tables.sh:
Allow on to run this from the source distribution
sql-common/client.c:
Fixed memory leak
sql/item_sum.cc:
Removed compiler warning
sql/slave.cc:
Cleanup
sql/sql_client.cc:
Portability fix
sql/sql_help.cc:
Fixed memory leak
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
and make sure to have the next changeset, which fixes this.
sql/item_geofunc.cc:
Fix warnings
sql/sql_help.cc:
Fix compiler errors
sql-common/client.c:
Delete and move redefination of shared memory stuff
libmysql/libmysql.c:
Fix for redefination stuff from client.c
VC++Files/client/mysqlclient.dsp:
add client.c
VC++Files/libmysql/libmysql.dsp:
add client.c
VC++Files/sql/mysqld.dsp:
add client.c and remove old convert.cpp and mini_client.c
sql/item_cmpfunc.cc:
Remove unused variables
sql/mysqld.cc:
fix the defination as this is different from the prototype (cl compiler failed)
sql/sql_insert.cc:
fix the windows error (without cast)
sql/sql_show.cc:
Remove unused variables
include/config-win.h:
Fix for Windows build to go (charsets + collation default defs)
VC++Files/client/mysqlclient.dsp:
Take care of newly added/removed files
VC++Files/libmysql/libmysql.dsp:
Take care of newly added/removed files
VC++Files/sql/mysqld.dsp:
Take care of newly added/removed files
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
VC++Files/libmysql/libmysql.dsp:
Fix the broken file
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-compile-netware-standard:
Delete: netware/BUILD/compile-netware-standard
BitKeeper/deleted/.del-mwenv:
Delete: netware/BUILD/mwenv
BitKeeper/deleted/.del-nwbootstrap:
Delete: netware/BUILD/nwbootstrap
BitKeeper/deleted/.del-compile-AUTOTOOLS:
Delete: netware/BUILD/compile-AUTOTOOLS
BitKeeper/deleted/.del-compile-linux-tools:
Delete: netware/BUILD/compile-linux-tools
BitKeeper/deleted/.del-compile-netware-END:
Delete: netware/BUILD/compile-netware-END
BitKeeper/deleted/.del-compile-netware-START:
Delete: netware/BUILD/compile-netware-START
BitKeeper/deleted/.del-compile-netware-all:
Delete: netware/BUILD/compile-netware-all
BitKeeper/deleted/.del-compile-netware-debug:
Delete: netware/BUILD/compile-netware-debug
BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
Auto merged
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
Auto merged
BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
Auto merged
BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
Auto merged
BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
Auto merged
Docs/internals.texi:
Auto merged
VC++Files/bdb/bdb.dsp:
Auto merged
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
Auto merged
VC++Files/bdb/build_win32/db_archive.dsp:
Auto merged
VC++Files/bdb/build_win32/db_buildall.dsp:
Auto merged
VC++Files/bdb/build_win32/db_checkpoint.dsp:
Auto merged
VC++Files/bdb/build_win32/db_deadlock.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dll.dsp:
Auto merged
VC++Files/bdb/build_win32/db_dump.dsp:
Auto merged
VC++Files/bdb/build_win32/db_java.dsp:
Auto merged
VC++Files/bdb/build_win32/db_load.dsp:
Auto merged
VC++Files/bdb/build_win32/db_printlog.dsp:
Auto merged
VC++Files/bdb/build_win32/db_recover.dsp:
Auto merged
VC++Files/bdb/build_win32/db_stat.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static.dsp:
Auto merged
VC++Files/bdb/build_win32/db_static1.dsp:
Auto merged
VC++Files/bdb/build_win32/db_tcl.dsp:
Auto merged
VC++Files/bdb/build_win32/db_test.dsp:
Auto merged
VC++Files/bdb/build_win32/db_upgrade.dsp:
Auto merged
VC++Files/bdb/build_win32/db_verify.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_access.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_env.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/ex_tpcb.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_access.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_btrec.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_env.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_lock.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_mpool.dsp:
Auto merged
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
Auto merged
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqlcheck.dsp:
Auto merged
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient.dsw:
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/comp_err/comp_err.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsp:
Auto merged
VC++Files/contrib/asm386/zlibvc.dsw:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsp:
Auto merged
VC++Files/contrib/minizip/zlibvc.dsw:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/dbug/dbug.dsw:
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/isam/isam.dsw:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsw:
Auto merged
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/libmysqltest/myTest.dsp:
Auto merged
VC++Files/libmysqltest/mytest.dsw:
Auto merged
VC++Files/merge/merge.dsp:
Auto merged
VC++Files/merge/merge.dsw:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysql.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsw:
Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
Auto merged
VC++Files/mysqlshutdown/myshutdown.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/mysys/mysys.dsw:
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/regex/regex.dsw:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
VC++Files/sql/mysqld.dsw:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
VC++Files/sql/old/mysqld.dsw:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsw:
Auto merged
VC++Files/strings/backup/strings.dsp:
Auto merged
VC++Files/strings/backup/strings.dsw:
Auto merged
VC++Files/strings/noMASM/strings.dsp:
Auto merged
VC++Files/strings/noMASM/strings.dsw:
Auto merged
VC++Files/strings/strings.dsw:
Auto merged
VC++Files/test1/test1.dsp:
Auto merged
VC++Files/thr_insert_test/thr_insert_test.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
client/mysqlbinlog.cc:
Auto merged
client/mysqlshow.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
include/thr_lock.h:
Auto merged
include/violite.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
libmysqld/lib_vio.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/auto_increment.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/func_like.test:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/default.c:
Auto merged
mysys/thr_lock.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/repl_failsafe.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.h:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/t_ctype.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/grant.res:
Auto merged
vio/viosocket.c:
Auto merged
VC++Files/bdb/bdb.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
Update to 4.1.0
VC++Files/bdb/build_win32/db_archive.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_buildall.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_checkpoint.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_deadlock.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_dll.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_dump.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_java.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_load.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_printlog.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_recover.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_stat.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_static.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_static1.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_tcl.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_test.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_upgrade.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/db_verify.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_access.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_btrec.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_env.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_lock.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_mpool.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/ex_tpcb.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_access.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_btrec.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_env.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_lock.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_mpool.dsp:
Update to 4.1.0
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
Update to 4.1.0
VC++Files/client/mysql.dsp:
Update to 4.1.0
VC++Files/client/mysqladmin.dsp:
Update to 4.1.0
VC++Files/client/mysqlcheck.dsp:
Update to 4.1.0
VC++Files/client/mysqlclient.dsp:
Update to 4.1.0
VC++Files/client/mysqlclient.dsw:
Update to 4.1.0
VC++Files/client/mysqldump.dsp:
Update to 4.1.0
VC++Files/client/mysqlimport.dsp:
Update to 4.1.0
VC++Files/client/mysqlshow.dsp:
Update to 4.1.0
VC++Files/comp_err/comp_err.dsp:
Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsp:
Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsw:
Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsp:
Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsw:
Update to 4.1.0
VC++Files/dbug/dbug.dsp:
Update to 4.1.0
VC++Files/dbug/dbug.dsw:
Update to 4.1.0
VC++Files/heap/heap.dsp:
Update to 4.1.0
VC++Files/innobase/innobase.dsp:
Update to 4.1.0
VC++Files/isam/isam.dsp:
Update to 4.1.0
VC++Files/isam/isam.dsw:
Update to 4.1.0
VC++Files/isamchk/isamchk.dsp:
Update to 4.1.0
VC++Files/libmysql/libmysql.dsw:
Update to 4.1.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Update to 4.1.0
VC++Files/libmysqld/libmysqld.dsp:
Update to 4.1.0
VC++Files/libmysqltest/myTest.dsp:
Update to 4.1.0
VC++Files/libmysqltest/mytest.dsw:
Update to 4.1.0
VC++Files/merge/merge.dsp:
Update to 4.1.0
VC++Files/merge/merge.dsw:
Update to 4.1.0
VC++Files/my_print_defaults/my_print_defaults.dsp:
Update to 4.1.0
VC++Files/myisam/myisam.dsp:
Update to 4.1.0
VC++Files/myisamchk/myisamchk.dsp:
Update to 4.1.0
VC++Files/myisamlog/myisamlog.dsp:
Update to 4.1.0
VC++Files/myisammrg/myisammrg.dsp:
Update to 4.1.0
VC++Files/myisampack/myisampack.dsp:
Update to 4.1.0
VC++Files/mysql.dsp:
Update to 4.1.0
VC++Files/mysql.dsw:
Update to 4.1.0
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Update to 4.1.0
VC++Files/mysqlcheck/mysqlcheck.dsp:
Update to 4.1.0
VC++Files/mysqldemb/mysqldemb.dsp:
Update to 4.1.0
VC++Files/mysqlmanager/MySqlManager.dsp:
Update to 4.1.0
VC++Files/mysqlmanager/mysqlmanager.dsw:
Update to 4.1.0
VC++Files/mysqlserver/mysqlserver.dsp:
Update to 4.1.0
VC++Files/mysqlshutdown/myshutdown.dsp:
Update to 4.1.0
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Update to 4.1.0
VC++Files/mysqlwatch/mysqlwatch.dsp:
Update to 4.1.0
VC++Files/mysys/mysys.dsp:
Update to 4.1.0
VC++Files/mysys/mysys.dsw:
Update to 4.1.0
VC++Files/pack_isam/pack_isam.dsp:
Update to 4.1.0
VC++Files/perror/perror.dsp:
Update to 4.1.0
VC++Files/regex/regex.dsp:
Update to 4.1.0
VC++Files/regex/regex.dsw:
Update to 4.1.0
VC++Files/replace/replace.dsp:
Update to 4.1.0
VC++Files/sql/mysqld.dsp:
Update to 4.1.0
VC++Files/sql/mysqld.dsw:
Update to 4.1.0
VC++Files/sql/mysqldmax.dsp:
Update to 4.1.0
VC++Files/sql/old/mysqld.dsw:
Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsp:
Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsw:
Update to 4.1.0
VC++Files/strings/backup/strings.dsp:
Update to 4.1.0
VC++Files/strings/backup/strings.dsw:
Update to 4.1.0
VC++Files/strings/noMASM/strings.dsp:
Update to 4.1.0
VC++Files/strings/noMASM/strings.dsw:
Update to 4.1.0
VC++Files/strings/strings.dsp:
Update to 4.1.0
VC++Files/strings/strings.dsw:
Update to 4.1.0
VC++Files/test1/test1.dsp:
Update to 4.1.0
VC++Files/thr_insert_test/thr_insert_test.dsp:
Update to 4.1.0
VC++Files/thr_test/thr_test.dsp:
Update to 4.1.0
VC++Files/vio/vio.dsp:
Update to 4.1.0
VC++Files/zlib/zlib.dsp:
Update to 4.1.0
bdb/build_win32/Berkeley_DB.dsw:
Update to 4.1.0
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
heap/_check.c:
Merge: Fixed DBUG_PRINT() usage
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
