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
myisam/mi_create.c:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log_event.cc:
merge with 4.0
sql/sql_db.cc:
merge with 4.0 (use local)
cmd-line-utils/libedit/chared.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/common.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/el.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/emacs.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/fgetln.c:
Removed RCSID to get rid of compiler warnings
Removed compiler warning
cmd-line-utils/libedit/hist.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/history.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/key.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/map.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/parse.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/prompt.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/read.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/readline.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/refresh.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/search.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/sig.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/term.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tokenizer.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tty.c:
Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/vi.c:
Removed RCSID to get rid of compiler warnings
mysys/Makefile.am:
Remove library dependency for charset2html to get correct makefile
tests/client_test.c:
Indentation change
This fixes a problem with SHOW PROCESSLIST
sql/log_event.cc:
Fixes cases where thd->query was not protected
sql/sql_acl.cc:
Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
Fixes cases where thd->query was not protected
myisam/mi_create.c:
Auto merged
sql/log.cc:
Auto merged
innobase/btr/btr0sea.c:
Merge with 3.23 (use local file)
sql/slave.cc:
merge with 3.23
sql/sql_db.cc:
Merge with 3.23
sql/sql_parse.cc:
Merge with 3.23
This fixes a possible core dump problem in SHOW PROCESSLIST
sql/slave.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
Only set thd->query to 0 if LOCK_thread_count is hold
Also first set query_length, then query
sql/sql_parse.cc:
Indentation changes
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
client/mysql.cc:
Removed compiler warnings.
Make quote handling simpler
include/config-win.h:
Fix for myisam/rt_mbr.c
include/mysql.h:
Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
Fix test case
sql/item_strfunc.cc:
Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
Don't use new password format if mysql.user has old format
sql/mysqld.cc:
Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
Don't use new password format if mysql.user has old format.
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
Remove compiler warnings
strings/ctype-win1250ch.c:
Remove compiler warnings
tests/grant.res:
Update results
Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/btr/btr0sea.c:
Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/include/btr0sea.h:
Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_unique.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/null.test:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
strings/Makefile.am:
Auto merged
libmysql/Makefile.shared:
merge
libmysql/libmysql.def:
merge
sql/ha_innodb.cc:
merge
sql/item_cmpfunc.cc:
merge
sql/log_event.cc:
merge
sql/sql_handler.cc:
merge
Allow one to change ANSI_QUOTES mode per thread and on the fly
sql/field.cc:
Use new my_strntoxxx functions where function clears errno.
Change variable names to 'not_used' for variables that is not used in function
sql/sql_base.cc:
comment
sql/sql_lex.cc:
Allow one to change ANSI_QUOTES mode per thread and on the fly
sql/sql_lex.h:
Allow one to change ANSI_QUOTES mode per thread and on the fly
strings/ctype-simple.c:
Changed my_strntoxxx functions to clear error number on start
Changed my_strtod() to correctly set return error number
strings/ctype-utf8.c:
Changed my_strntoxxx functions to clear error number on start
Changed my_strtod() to correctly set return error number