libmysqld/lib_sql.cc:
Fix for new bitmap
mysql-test/r/rpl_get_lock.result:
Fix results after merge
mysql-test/r/rpl_skip_error.result:
Fix results after merge
sql/log_event.cc:
Finish merge of slave.cc
sql/slave.cc:
Finish merge
extra/resolve_stack_dump.c:
Auto merged
include/my_bitmap.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
mysql-test/t/rpl_get_lock.test:
Auto merged
client/mysqltest.c:
--replace_result can now use variables
mysql-test/r/rpl000014.result:
Fix to use new replace
mysql-test/r/rpl000015.result:
Fix to use new replace
mysql-test/r/rpl000016.result:
Fix to use new replace
mysql-test/r/rpl_log.result:
Fix to use new replace
mysql-test/t/join.test:
Fix to use new replace
mysql-test/t/rpl000014.test:
Fix to use new replace
mysql-test/t/rpl000015.test:
Fix to use new replace
mysql-test/t/rpl000016.test:
Fix to use new replace
mysql-test/t/rpl_log.test:
Fix to use new replace
readline/rltty.c:
Add missing function
Add diagnostic code to find out why foreign key constraint creation sometimes fails
innobase/dict/dict0crea.c:
Add diagnostic code to find out why foreign key constraint creation sometimes fails
Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized
innobase/buf/buf0buf.c:
Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized
Added new tests to testsuite.
extra/resolveip.c:
Portabilit fix.
mysql-test/create-test-result:
Fix for new mysql-test-run
mysql-test/r/query_cache.result:
Updated benchmarks
mysql-test/t/query_cache-master.opt:
Updated benchmarks
mysql-test/t/query_cache.test:
Updated benchmarks
sql/sql_cache.cc:
Removed not used functions
sql/sql_cache.h:
Removed not used functions
Docs/manual.texi:
fixed bad merge
include/my_bitmap.h:
fixed comment format
mysql-test/r/rpl_get_lock.result:
make the test results predicable
mysql-test/t/rpl_get_lock.test:
predicatable test results
mysys/my_bitmap.c:
do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
clean-up suggested by Monty to make init_slave_skip_errors() more compact
Add 4.0 commands to SHOW STATUS.
Docs/manual.texi:
Cleanup
mysql-test/r/innodb.result:
Fixe results
sql/mysqld.cc:
Add commands unique for 4.0
sql/sql_lex.h:
Cleanup
sql/sql_parse.cc:
Cleanup
sql/sql_show.cc:
Fix that SHOW STATUS works with SSL.
sql/sql_yacc.yy:
Cleanup
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
Docs/manual.texi:
Merge
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Docs/Makefile.am:
Add missing files
Docs/manual.texi:
Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
Removed compiler warnings
mysql-test/mysql-test-run.sh:
Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
New tests
mysql-test/t/func_str.test:
Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
New HEX() function
sql/item_strfunc.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
New HEX() function
sql/item_timefunc.cc:
cleanup
sql/lex.h:
FLUSH DES_KEY_FILE
sql/mysql_priv.h:
FLUSH DES_KEY_FILE
sql/mysqld.cc:
FLUSH DES_KEY_FILE
sql/sql_parse.cc:
Cleanup sql_yacc.yy
sql/sql_yacc.yy:
Cleanup sql_yacc.yy
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported
to 3.23 anyway
Docs/manual.texi:
documented slave-skip-errors
updated change history
extra/resolve_stack_dump.c:
fixed wrong help message
include/my_bitmap.h:
bitmap code updates
mysql-test/r/rpl_get_lock.result:
test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
test for possible bug in release_lock replication
mysys/my_bitmap.c:
bitmap code updates/clean-up
sql/mysqld.cc:
slave-skip-errors
sql/slave.cc:
slave-skip-errors
sql/slave.h:
slave skip errors
Fixed bug in query cache.
Cleaned up des_crypt code.
BitKeeper/deleted/.del-fsck.mysql~87170d4358b50d60:
Delete: fs/fsck.mysql
Docs/manual.texi:
Changed != to <>
mysql-test/mysql-test-run.sh:
Fix sleep times to take into account creation of InnoDB tables.
mysql-test/r/group_by.result:
More tests
mysql-test/r/query_cache.result:
More tests
mysql-test/r/union.result:
More tests
mysql-test/t/func_str.test:
Fix for FreeBSD
mysql-test/t/query_cache.test:
More tests
mysql-test/t/union.test:
More tests
mysys/my_winsem.c:
Cleanup comments
sql/des_key_file.cc:
Cleanup des_crypt code
sql/item_strfunc.cc:
Cleanup des_crypt code
sql/item_strfunc.h:
Cleanup des_crypt code
sql/mysql_priv.h:
Cleanup des_crypt code
sql/mysqld.cc:
Cleanup des_crypt code
sql/sql_acl.cc:
For for GRANT and lower-case-table names
sql/sql_cache.cc:
Function for integrity checking.
Fixed bug when merging blocks.
sql/sql_cache.h:
Function for integrity checking.
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
For for GRANT and lower-case-table names
sql/sql_union.cc:
Cleanup & fixed bug in LIMIT handling
sql/sql_yacc.yy:
C
Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/dict/dict0dict.c:
Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/ut/ut0byte.c:
Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/include/ut0byte.h:
Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
Docs/manual.texi:
ChangeLog
innobase/os/os0file.c:
Removed compiler warnings
myisam/mi_check.c:
Fix for records > 16M
myisam/mi_dynrec.c:
Fix for records > 16M
myisam/myisamdef.h:
Fix for records > 16M
sql/sql_select.cc:
Cleanup
sql/sql_yacc.yy:
F
