horrible bug fixed
mysql-test/r/fulltext_multi.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_order_by.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_update.result:
Change mode to -rw-rw-r--
mysql-test/r/fulltext_var.result:
Change mode to -rw-rw-r--
mysql-test/r/bulk_replace.result:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
Change mode to -rw-rw-r--
include/my_global.h:
FreeBSD fix for openssl
myisam/ft_static.c:
some boolean search operators added
sql/sql_parse.cc:
fixed horrible bug that makes mysqld CRASH when mysql client is started
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
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
Docs/manual.texi:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/group_by.test:
Auto merged
sql/stacktrace.c:
Auto merged
mysql-test/r/group_by.result:
To be corrected..
Changed mysql-test-run.sh to test for files to get shorter, more reliable timeouts.
Docs/manual.texi:
Cleaned up SET PASSWORD stuff
client/mysqltest.c:
Do more retrys
mysql-test/mysql-test-run.sh:
Test for files to get shorter timeouts
mysql-test/r/query_cache.result:
Portability fix
mysql-test/t/query_cache.test:
Portability fix
sql/sql_cache.cc:
Safety fix
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
New tests
mysql-test/t/group_by.test:
New tests
sql/stacktrace.c:
Fix for SCO
mysys/queue.c: /* comment added */
mysql-test/r/fulltext.result:
test for truncation operator in indexless bolelan fts
mysql-test/t/fulltext.test:
test for truncation operator in indexless bolelan fts
mysys/queues.c:
comment added
Docs/manual.texi:
Auto merged
Build-tools/Do-compile:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
myisam/mi_locking.c:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_innobase.h:
Auto merged
sql/handler.h:
Auto merged
configure.in:
merge
mysql-test/r/innodb.result:
merge
mysql-test/r/join_outer.result:
merge
mysql-test/r/myisam.result:
merge
mysql-test/t/innodb.test:
merge
mysys/mf_iocache2.c:
Skip changes in 3.23
sql/sql_select.cc:
merge
Docs/manual.texi:
Added information about RESET
sql/mysql_priv.h:
Fixed wrong type
sql/sql_base.cc:
Removed wrong info in DBUG output
sql/sql_class.cc:
cleanup
sql/sql_parse.cc:
Fixed wrong type
Docs/manual.texi:
ChangeLog
myisam/mi_locking.c:
Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
Release character sets at end
scripts/mysqlhotcopy.sh:
RAID tables are now copied
Build-tools/Do-compile:
Merge with 4.0
Docs/manual.texi:
Changelog
mysql-test/r/innodb.result:
New tests cases for ORDER BY
mysql-test/r/myisam.result:
New tests cases for ORDER BY
mysql-test/t/innodb.test:
New tests cases for ORDER BY
mysql-test/t/myisam.test:
New tests cases for ORDER BY
Small improvement to write caching.
Docs/manual.texi:
Updated Changelog
mysql-test/r/rpl000013.result:
Fix after merge
mysql-test/r/rpl000016.result:
Fix after merge
mysys/mf_iocache2.c:
Small improvement to write caching.
sql/sql_select.cc:
Removed warning
Docs/manual.texi:
Auto merged
mysql-test/t/rpl000013.test:
Auto merged
mysql-test/t/rpl000016.test:
Auto merged
extra/resolveip.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Portability fixes.
BUILD/compile-alpha-debug:
Update to newer version
libmysqld/lib_vio.c:
dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
Update for new tests
mysql-test/t/symlink.test:
Update for new test format
mysys/mf_iocache2.c:
Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
Update with delete tests
sql/mysqld.cc:
Updates for amiga
sql/sql_string.cc:
Fix typo
sql/stacktrace.c:
Portability fix
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.
mysql-test/r/rpl000016.result:
updated test result
mysql-test/t/rpl000013.test:
test alias bug
mysql-test/t/rpl000016.test:
test for proper skip when the user messes up
sql/slave.cc:
proper skip even when the user goofs up
sql/sql_base.cc:
drop real name, not last used alias in the log
include/my_global.h:
Remove dbug_assert() (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
Fixed that xterm works on Solaris 2.8.
Fixed printing of errors
mysql-test/r/isam.result:
Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
Removed MyISAM test from ISAM test
mysys/my_alloc.c:
Removed warnings
mysys/my_bitmap.c:
Use DBUG_ASSERT
mysys/my_pthread.c:
Use DBUG_ASSERT
mysys/my_seek.c:
More DBUG
sql/ha_berkeley.cc:
Use DBUG_ASSERT
sql/ha_innobase.cc:
Use DBUG_ASSERT
sql/log.cc:
Use DBUG_ASSERT
sql/opt_range.cc:
Use DBUG_ASSERT
sql/sql_base.cc:
Use DBUG_ASSERT
sql/sql_handler.cc:
Use DBUG_ASSERT
sql/sql_load.cc:
Cleanup
sql/sql_parse.cc:
Use DBUG_ASSERT
sql/sql_repl.cc:
Cleanup
sql/sql_select.cc:
Use DBUG_ASSERT
tools/mysqlmanager.c:
Cleanup
Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.
Docs/manual.texi:
Changelog
mysql-test/r/null_key.result:
Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
Fixed bug when joining with caching
Update test results for MySQL 4.0
extra/resolveip.c:
Fix for SCO
mysql-test/r/backup.result:
Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
Update test results for MySQL 4.0
mysys/mf_casecnv.c:
Patch for SCO
mysys/mf_qsort.c:
Patch for SCO
mysys/my_compress.c:
Patch for SCO
strings/ctype.c:
Patch for SCO
