fixed compilation problem on FreeBSD
added test for truncating temporary tables
mysql-test/r/truncate.result:
truncate test
mysql-test/t/truncate.test:
truncate test update
mysys/safemalloc.c:
fixed FreeBSD compilation problem
sql/sql_delete.cc:
fixed bug in truncating temporary tables
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysqldumpslow.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/Makefile.am:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Docs/manual.texi:
merge
client/mysql.cc:
merge
client/mysqldump.c:
merge
innobase/buf/buf0buf.c:
merge
innobase/os/os0file.c:
merge
innobase/row/row0mysql.c:
merge
mysql-test/r/range.result:
merge
sql/ha_innodb.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/sql_base.cc:
merge
sql/sql_load.cc:
merge
configure.in:
new configure parameter (now only for embeded server)
include/my_global.h:
now query cache always included in server, because of problrms with test suit
mysql-test/r/flush.result:
removed double testing
mysql-test/t/flush.test:
removed double testing
mysql-test/t/grant_cache.test:
now it is only memo about query cache
mysql-test/t/query_cache.test:
now it is only memo about query cache
Docs/manual.texi:
Changelog
myisam/myisampack.c:
Delete tmp file on error.
mysql-test/r/range.result:
Updated test case
mysql-test/t/range.test:
Updated test case
Fix thread-related bug when doing DROP TABLE
Fix bug in RENAME TABLE on windows
Docs/manual.texi:
Changelog
client/mysqldump.c:
Quote names to SHOW CREATE
mysql-test/t/range.test:
Test case for range bug
sql/lock.cc:
Fix thread-related bug when doing DROP TABLE
sql/sql_base.cc:
Fix thread-related bug when doing DROP TABLE
sql/sql_rename.cc:
Fix bug in RENAME TABLE on windows
checkings
mysql-test/r/union.result:
fix for the limit bug in UNION's
mysql-test/t/union.test:
fix for the limit bug in UNION's
sql/sql_union.cc:
fix for the limit bug in UNION's
sql/sql_yacc.yy:
Syntax checking for options that should appear in main select only.
memory corruption I can only repeat on one system.
mysql-test/r/multi_update.result:
extended test trying to find why the old one was failing
mysql-test/r/rpl000015.result:
result update
mysql-test/t/multi_update.test:
updated test to do more intermediate result checks
mysql-test/t/rpl000014.test:
cosmetic change
mysql-test/t/rpl000015-slave-master-info.opt:
reduce connect retry trying to simulate a bug
mysql-test/t/rpl000015.test:
cosmetic change
sql/lex.h:
added RELAY_LOG_FILE and RELAY_LOG_POS to CHANGE MASTER TO
sql/log.cc:
fixed replication bug
sql/log_event.cc:
properly ignore replication errors according to error mask
sql/mysqld.cc:
handle SIGFPE in the coredump handler
sql/slave.cc:
do not kick slave if it has already exited and freed the structures
sql/sql_lex.cc:
fixed initialization bug in CHANGE MASTER TO
sql/sql_lex.h:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_repl.cc:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_yacc.yy:
CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
client/mysqlimport.c:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
Fix for HEAP tables with many rows deleted.
Add '' arround database names in SHOW GRANT
Docs/manual.texi:
Fixed symlink examples.
heap/hp_rfirst.c:
Remove not needed patch.
mysql-test/r/heap.result:
Added test case for HEAP + many deletes
mysql-test/t/heap.test:
Added test case for HEAP + many deletes
mysys/mf_loadpath.c:
Resolve path's even if they don't end in '/'
scripts/mysqldumpslow.sh:
Fix for new dump format.
sql/handler.cc:
Fix for HEAP tables with many rows deleted.
sql/sql_acl.cc:
Add '' arround database names in SHOW GRANT
Fix for bug on intel where (int32) 1 << 32 == 1, which gave problems when using 32 keys.
Allow SET PASSWORD for anonymous user
Docs/manual.texi:
Changelog
client/mysql.cc:
Added help for --local-infile
client/mysqlimport.c:
Merge with 4.0.
Patch for LOCAL INFILE handling
configure.in:
cleanup
include/global.h:
Fix for bug on intel where (int32) 1 << 32 == 1
mysql-test/r/create.result:
Test of CREATE TABLE with 32 keys
mysql-test/t/create.test:
Test of CREATE TABLE with 32 keys
scripts/mysqlhotcopy.sh:
Patch for databasenames with space.
sql/ha_isam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisam.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/ha_myisammrg.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
sql/mysqld.cc:
Added help for --local-infile
sql/sql_acl.cc:
Allow SET PASSWORD of anonymous user
sql/table.cc:
Fix for bug on intel where (int32) 1 << 32 == 1
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
strings/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
strings/Makefile.am:
Auto merged
Build-tools/Do-compile:
Fixed typo
Docs/manual.texi:
Changelog
mysql-test/r/type_date.result:
Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
Fix for RAID files
sql/table.cc:
Fixed typo in last patch
mysql-test/mysql-test-run.sh:
Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
Added result for a new test of combo of options for FOUND_ROWS and
BUFFER_RESULT
mysql-test/t/select_found.test:
Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS
Fix problem with HAVING and MAX() IS NOT NULL
Docs/manual.texi:
Changelog & NULL usage with ORDER BY
client/mysqldump.c:
Cleanup disable keys
mysql-test/r/distinct.result:
Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
Testcase for bug with HAVING
mysql-test/t/distinct.test:
Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
Fix sorting of NULL values (Should always be first)
sql/item.h:
Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
Fix sorting of NULL values
sql/sql_select.cc:
Fix sorting of ORDER BY ... DESC on NULL values.
mysql-test/r/fulltext.result:
test added
mysql-test/t/fulltext.test:
test added
sql/item_func.cc:
fulltext+const_table problem fixed once and forever
sql/item_func.h:
fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
fulltext+const_table problem fixed once and forever
sql/table.h:
fulltext+const_table problem fixed once and forever
libmysql/libmysql.c:
Fixes a very rare bug when variable name (without '_') and it's
value are at the very end of the config file.
I have tested it , but would liek little mobster to test it further
mysql-test/r/union.result:
results for union test that proves that EXPLAIN UNION bugs are fixed
mysql-test/t/union.test:
additional tests for EXPLAIN on UNION's that have previously failed
sql/sql_yacc.yy:
Some small fixes for newer parsers.
Only unsigned int yystacksize remains to be fixed.
This I leave to Monty.
Present fixes are only aesthetic and do not harm.
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-alpha:
Auto merged
BUILD/compile-pentium-gcov:
Auto merged
BUILD/compile-pentium-gprof:
Auto merged
BUILD/compile-pentium:
Auto merged
BitKeeper/deleted/.del-my_new.cc:
Delete: mysys/my_new.cc
Build-tools/Do-compile:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
bdb/dist/configure.in:
Auto merged
client/Makefile.am:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/my_lock.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
support-files/my-medium.cnf.sh:
Auto merged
support-files/my-small.cnf.sh:
Auto merged
configure.in:
merge
innobase/row/row0mysql.c:
merge
innobase/trx/trx0trx.c:
merge
mysql-test/r/innodb.result:
merge
mysql-test/r/join.result:
merge
sql/ha_innodb.cc:
merge
sql/slave.cc:
merge
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.
client/mysqltest.c:
added require_version
mysql-test/mysql-test-run.sh:
added --master-binary=,--slave-binary=,--old-master options
sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
fixed bug in LOAD DATA INFILE replication from 3.23 master
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
Docs/manual.texi:
Changelog
configure.in:
Cleanup
myisam/myisamchk.c:
Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
Test for bugfix
mysql-test/r/rpl000001.result:
fix wrong result
mysql-test/r/select.result:
Fix things after fixing ignore index()
mysql-test/r/select_found.result:
Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
fix wrong result
mysql-test/t/select_found.test:
Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
Added counting of rollback's and commits
sql/mysql_priv.h:
Added counting of rollback's and commits
sql/mysqld.cc:
Added counting of rollback's and commits
sql/sql_select.cc:
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN
Docs/manual.texi:
ChangeLog
include/my_getopt.h:
Removed compiler warnings
myisam/myisamchk.c:
Fixes for new getopt
mysql-test/r/explain.result:
Updated test results
mysql-test/r/innodb.result:
Updated test results
mysql-test/r/join.result:
Updated test results
mysql-test/t/innodb.test:
Updated test results
mysys/default.c:
Bug fix when using --no-defaults
mysys/my_getopt.c:
Fixes for new getopt
sql/ha_innodb.cc:
Sets ref_length to right value (faster rnd_pos() handling).
Fixed problem with multi-table-delete.
Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
Remove not used index from EXPLAIN
sql/sql_cache.cc:
Fixed core dump bug when not using query cache
sql/sql_select.cc:
Remove not used index from EXPLAIN
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0rec.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/hash.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/t/rpl000001.test:
modified test to break current replicatioin on a large log with a large lag
in slave thread between append and read of the relay log
mysys/mf_iocache.c:
fixed one bug in IO_CACHE but there is another one not fixed yet
sql/slave.cc:
fixed bug in 3.23 master replication
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Docs/manual.texi:
Fixed Changelog, upgrading to 4.0 and 4.1 TODO sections.
Docs/mysqld_error.txt:
Added error message.
configure.in:
Fix for autoconf 2.52
include/my_getopt.h:
Portability fix.
include/my_global.h:
Portablity fix.
include/mysqld_error.h:
New error messages
mysql-test/r/bigint.result:
Test of unsigned BIGINT values.
mysql-test/r/func_op.result:
Test of unsigned BIGINT values.
mysql-test/r/varbinary.result:
Test of unsigned BIGINT values.
mysql-test/t/bigint.test:
Test of unsigned BIGINT values.
sql/item_func.h:
Optimized Item_int_func() usage.
sql/lock.cc:
Cleanup comments
sql/log.cc:
Cleanup
sql/log_event.cc:
Cleanup and portability fixes.
sql/log_event.h:
Cleanup and portability fixes.
sql/mini_client.cc:
Cleanup and portability fixes.
sql/mysqld.cc:
Fix for queries-per-hour
sql/repl_failsafe.cc:
Prepare for making binary log 2G clean.
sql/share/czech/errmsg.txt:
New error messages
sql/share/danish/errmsg.txt:
New error messages
sql/share/dutch/errmsg.txt:
New error messages
sql/share/english/errmsg.txt:
New error messages
sql/share/estonian/errmsg.txt:
New error messages
sql/share/french/errmsg.txt:
New error messages
sql/share/german/errmsg.txt:
New error messages
sql/share/greek/errmsg.txt:
New error messages
sql/share/hungarian/errmsg.txt:
New error messages
sql/share/italian/errmsg.txt:
New error messages
sql/share/japanese/errmsg.txt:
New error messages
sql/share/korean/errmsg.txt:
New error messages
sql/share/norwegian-ny/errmsg.txt:
New error messages
sql/share/norwegian/errmsg.txt:
New error messages
sql/share/polish/errmsg.txt:
New error messages
sql/share/portuguese/errmsg.txt:
New error messages
sql/share/romanian/errmsg.txt:
New error messages
sql/share/russian/errmsg.txt:
New error messages
sql/share/slovak/errmsg.txt:
New error messages
sql/share/spanish/errmsg.txt:
New error messages
sql/share/swedish/errmsg.txt:
New error messages
sql/share/ukrainian/errmsg.txt:
New error messages
sql/slave.cc:
Cleanup
sql/slave.h:
Cleanup
sql/sql_acl.cc:
Cleanup and removal of possible reserved words
sql/sql_base.cc:
More DBUG
sql/sql_cache.cc:
Cleanup & portability fixes
sql/sql_class.h:
Make binary log 4G clean
sql/sql_delete.cc:
More DBUG
sql/sql_handler.cc:
Cleanup & portability fixes
sql/sql_parse.cc:
Cleanup of queries-per-hours code
sql/sql_rename.cc:
Add missing DBUG_RETURN
sql/sql_repl.cc:
Cleanup & portability fixes
sql/sql_select.cc:
Cleanup & portability fixes
sql/sql_show.cc:
Cleanup & portability fixes
sql/sql_update.cc:
Small cleanup of multi-update-code (need second pass)
sql/sql_yacc.yy:
Changed syntax for GRANT ... QUERIES PER HOUR
strings/str2int.c:
Cleanup & portability fixes
likely() and unlikely() branch prediction compiler hint macros
clean-up of comments
include/my_global.h:
added likely() and unlikely() macros to help some compilers optimize
the code for architecture-specific branch prediction policies
include/my_sys.h:
coverted my_b_append_tell() from macro to a function as it needed to be more
complex to avoid a potential race condition
mysql-test/mysql-test-run.sh:
hostname-independent relay log name to have consistent SHOW SLAVE STATUS
output
mysql-test/r/rpl000014.result:
result update
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000017-slave.sh:
proper cleanup of old logs
mysys/mf_iocache.c:
cosmetic changes + more debugging asserts
mysys/mf_iocache2.c:
my_b_append_tell()
cleanup of comments
sql/log.cc:
fix potential bug - do not rotate log in the middle of event
sql/slave.cc:
do not write stop events when the server does not actually stop but just
rotates the log
fixed race between queue_event() and show_slave_status()
clean-up of comments
sql/slave.h:
added ignore_stop_event flag to SLAVE_LOG_INFO
