BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
ltmain.sh:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
libmysqld/Makefile.am:
sql_unions -> sql_union
BitKeeper/etc/ignore:
Added libmysqld/sql_union.cc to the ignore list
mysql-test/mysql-test-run.sh:
fix to get path-independent logging
mysql-test/r/rpl_log.result:
fix for path-independent logging
sql/log.cc:
fixed compile error with USING_TRANSACTIONS
sql/log_event.h:
fixed compile error with USING_TRANSACTIONS
mysql-test/r/rpl_log.result:
fixed result for new file_id generating method
BitKeeper/etc/ignore:
Added vio/viotest-ssl to the ignore list
sql/log.cc:
use a different method to generate unique file_id
sql/log_event.cc:
new file_id generationg method
sql/sql_class.h:
new file_id generationg method
Stop event and bugs the test suite could not catch
Did some big restructuring of binlog event classes - most important
change is that now each event class has exec_event method and one does
not need to modify slave core code to add a new event. Slave code is
now much smaller and easier to read
include/my_sys.h:
pre_code and arg in IO_CACHE
mysql-test/r/rpl_log.result:
updated result for LOAD DATA INFILE fix
mysys/mf_iocache.c:
pre_close routine and arg pointer for callback magic
sql/log.cc:
changed MYSQL_LOG so that write() method is for generic
Log_event - removed redundant code
sql/log_event.cc:
added classes for file events
added exec_event() method to all classes
restructured/cleaned up event classes
sql/log_event.h:
added classes for file events
added exec_event() method to all classes
restructured/cleaned up event classes
sql/mf_iocache.cc:
pre_close/arg
sql/mysqld.cc:
added slave-load-tmpdir and old-rpl-compat options
sql/slave.cc:
changed exec_event() to use Log_event::exec_event()
some routines are now needed in log_event.cc and cannot be static/inline
general cleanup
sql/slave.h:
some routines are now extern because they are called from log_event.cc
sql/sql_class.cc:
added slave_net
sql/sql_class.h:
added slave_net to THD
MYSQL_LOG::write now handles generic Log_event
sql/sql_load.cc:
changes for new handling of LOAD DATA INFILE replication
sql/sql_repl.cc:
added log_loaded_block() callback for IO_CACHE
sql/sql_repl.h:
added structure to pass args to IO_CACHE callback from mysql_load
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
Docs/manual.texi:
Changelog
include/mysqld_error.h:
Add new error messages needed for UNION
mysql-test/r/union.result:
New tests for UNION
mysql-test/t/analyse.test:
Add missing drop table
mysql-test/t/union.test:
new tests for UNION
sql/Makefile.am:
Change name of sql_unions.cc to sql_union.cc
sql/item.cc:
Use List_iterator_fast
sql/item_cmpfunc.cc:
Use List_iterator_fast
sql/item_func.cc:
Use List_iterator_fast
sql/item_sum.cc:
Use List_iterator_fast
Optimize count(distinct)
Cleanup of indentation and comments
sql/item_sum.h:
Optimize count(distinct)
sql/key.cc:
Use List_iterator_fast
sql/mysql_priv.h:
Add new option bits
sql/opt_sum.cc:
Use List_iterator_fast
sql/share/Makefile.am:
Add 'fix_errors' label
sql/share/czech/errmsg.txt:
Add new error messages needed for UNION
sql/share/danish/errmsg.txt:
Add new error messages needed for UNION
sql/share/dutch/errmsg.txt:
Add new error messages needed for UNION
sql/share/english/errmsg.txt:
Add new error messages needed for UNION
sql/share/estonian/errmsg.txt:
Add new error messages needed for UNION
sql/share/french/errmsg.txt:
Add new error messages needed for UNION
sql/share/german/errmsg.txt:
Add new error messages needed for UNION
sql/share/greek/errmsg.txt:
Add new error messages needed for UNION
sql/share/hungarian/errmsg.txt:
Add new error messages needed for UNION
sql/share/italian/errmsg.txt:
Add new error messages needed for UNION
sql/share/japanese/errmsg.txt:
Add new error messages needed for UNION
sql/share/korean/errmsg.txt:
Add new error messages needed for UNION
sql/share/norwegian-ny/errmsg.txt:
Add new error messages needed for UNION
sql/share/norwegian/errmsg.txt:
Add new error messages needed for UNION
sql/share/polish/errmsg.txt:
Add new error messages needed for UNION
sql/share/portuguese/errmsg.txt:
Add new error messages needed for UNION
sql/share/romanian/errmsg.txt:
Add new error messages needed for UNION
sql/share/russian/errmsg.txt:
Add new error messages needed for UNION
sql/share/slovak/errmsg.txt:
Add new error messages needed for UNION
sql/share/spanish/errmsg.txt:
Add new error messages needed for UNION
sql/share/swedish/errmsg.txt:
Add new error messages needed for UNION
sql/sql_analyse.cc:
Use List_iterator_fast
sql/sql_base.cc:
Use List_iterator_fast
Add new argument to setup_fields
sql/sql_class.cc:
Use List_iterator_fast
sql/sql_class.h:
Create new class for UNION
sql/sql_handler.cc:
Use List_iterator_fast
sql/sql_insert.cc:
Use List_iterator_fast
sql/sql_lex.h:
Cleanup
sql/sql_list.cc:
Faster iteration of lists
sql/sql_list.h:
Faster iterations of lists
sql/sql_load.cc:
Use List_iterator_fast
sql/sql_parse.cc:
Fix UNION code
sql/sql_select.cc:
Use List_iterator_fast
Make create_tmp_table more general to be usable by UNION
sql/sql_select.h:
Changes to speed up copy_fields()
sql/sql_show.cc:
Use List_iterator_fast
sql/sql_table.cc:
Use List_iterator_fast
sql/sql_union.cc:
Fix UNION code
sql/sql_update.cc:
Use List_iterator_fast
sql/sql_yacc.yy:
Fix UNION code
Extended default arguments to be up to 4095 characters
Docs/manual.texi:
Update lof LOCK TABLES
mysql-test/r/order_by.result:
Test for optimizer bug in ORDER BY
mysql-test/t/order_by.test:
Test for optimizer bug in ORDER BY
mysys/default.c:
Extended default arguments to be up to 4095 characters
sql/sql_select.cc:
Fixed optimizer bug in ORDER BY
Remove unused argument to ha_berkeley::remove_key().
mysql-test/r/bdb.result:
Add test case for update/replace bug in bdb.
BitKeeper/etc/ignore:
Added .gdbinit .vimrc to the ignore list
mysql-test/t/bdb.test:
Add test case for update/replace bug in bdb.
sql/ha_berkeley.cc:
The packed_record argument to ha_berkeley::remove_key() was never
used; remove it.
sql/ha_berkeley.h:
The packed_record argument to ha_berkeley::remove_key() was never
used; remove it.
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
configure.in:
New version
added a test case for it - took some creative work to figure out
how to make it happen at will
updated the manual
Docs/manual.texi:
fixed wrong info on SLAVE_SKIP_COUNTER
fixed wrong info in BitKeeper tree build instructions
updated change history about bug fix
mysql-test/t/rpl_sporadic_master.test:
tried hard to get slave confused, but failed. nevertheless, a more
exhaustive test case does not hurt
sql/slave.cc:
fixed mysterious offset confusion bug
mysql-test/r/rpl_sporadic_master.result:
Made test portable accross table handlers
mysql-test/t/rpl_sporadic_master.test:
Made test portable accross table handlers
Added warning for tables where the auto_increment key is 0
Fixed DELETE ... LIMIT 0
Fixed UPDATE ..LIMIT 0
Docs/manual.texi:
Changelog + Update to CHECK TABLE
configure.in:
Patch for netBSD
mit-pthreads/gen/ctime.c:
Patch for netBSD
mit-pthreads/machdep/netbsd-1.1/__signal.h:
Patch for netBSD
mit-pthreads/stdio/strerror.c:
Patch for netBSD
myisam/mi_check.c:
Added warning for tables where the auto_increment key is 0
myisam/myisamchk.c:
Added warning for tables where the auto_increment key is 0
mysql-test/r/auto_increment.result:
Added warning for tables where the auto_increment key is 0
mysql-test/r/limit.result:
Test of DELETE ... LIMIT 0
mysql-test/t/auto_increment.test:
Added warning for tables where the auto_increment key is 0
mysql-test/t/limit.test:
Test of DELETE ... LIMIT 0
sql/Makefile.am:
Don't add mysqld_LDADD to mysqlbinlog (portability patch)
sql/ha_gemini.cc:
Changed copyright (have got ok from NuSphere previously)
sql/ha_gemini.h:
Changed copyright (have got ok from NuSphere previously)
sql/sql_delete.cc:
Fixed DELETE ... LIMIT 0
sql/sql_update.cc:
Fixed UPDATE ..LIMIT 0
mysql-test/r/show_check.result:
Added back old code
sql/ha_myisam.h:
Removed warning
sql/mysql_priv.h:
Added back old code
sql/sql_base.cc:
Added back old code
sql/sql_parse.cc:
Added back old code
sql/sql_show.cc:
Added back old code
test SHOW OPEN TABLES
mysql-test/r/show_check.result:
updated result
mysql-test/t/show_check.test:
test show open tables
sql/mysql_priv.h:
post-merge fixes
sql/sql_base.cc:
post-merge fixes
sql/sql_parse.cc:
post-merge fixes
include/mysqld_error.h:
new error message
mysql-test/r/rpl_log.result:
updated results
mysql-test/t/rpl_log.test:
test show new master for slave
sql/lex.h:
show new master for slave
sql/share/czech/errmsg.txt:
new error
sql/share/danish/errmsg.txt:
new error
sql/share/dutch/errmsg.txt:
new error
sql/share/english/errmsg.txt:
new error
sql/share/estonian/errmsg.txt:
new error
sql/share/french/errmsg.txt:
new error
sql/share/german/errmsg.txt:
new error
sql/share/greek/errmsg.txt:
new error
sql/share/hungarian/errmsg.txt:
new error
sql/share/italian/errmsg.txt:
new error
sql/share/japanese/errmsg.txt:
new error
sql/share/korean/errmsg.txt:
new error
sql/share/norwegian-ny/errmsg.txt:
new error
sql/share/norwegian/errmsg.txt:
new error
sql/share/polish/errmsg.txt:
new error
sql/share/portuguese/errmsg.txt:
new error
sql/share/romanian/errmsg.txt:
new error
sql/share/russian/errmsg.txt:
new error
sql/share/slovak/errmsg.txt:
new error
sql/share/spanish/errmsg.txt:
new error
sql/share/swedish/errmsg.txt:
new error
sql/sql_lex.h:
show new master for slave
sql/sql_parse.cc:
show new master for slave
sql/sql_repl.cc:
show new master for slave
sql/sql_repl.h:
show new master for slave
sql/sql_yacc.yy:
show new master for slave
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format
Docs/manual.texi:
Update Changelog
client/mysqldump.c:
Fixed dump to use -- instead of # as comment characters.
libmysql/libmysql.c:
Removed support for the 3.20 protocol format
myisam/myisamchk.c:
Fixed typo in printf
mysql-test/r/varbinary.result:
Test of new hex constant format
mysql-test/t/varbinary.test:
Test of new hex constant format
sql/sql_lex.cc:
Added support for ANSI SQL X'hex-string' format.
sql/sql_lex.h:
Added support for ANSI SQL X'hex-string' format.
sql/sql_yacc.yy:
Added support for ANSI SQL X'hex-string' format.
fixes for rpl_log test to make it config-independent
BitKeeper/etc/ignore:
Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
if we got wrong result on eval_result test case, diff against the
expanded result, not the template
mysql-test/r/rpl_log.result:
change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
get server version from the server
remove obsoleted replace hack to solve port problem - use eval_result
instead
Docs/manual.texi:
Update with changes from old version of the 4.0 manual.
mysql-test/r/order_by.result:
New tests for ORDER BY ... DESC
mysql-test/t/order_by.test:
New tests for ORDER BY ... DESC
sql/sql_delete.cc:
Removed DEBUG code
added debugging options to master to behave sporadically, and a
test case to make sure the slave can deal with it
BitKeeper/triggers/post-commit:
fixed message
sql/mysqld.cc:
added debugging options to force the master to occasionally break
replication
sql/slave.cc:
cosmetic change to improve readability
sql/sql_repl.cc:
support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
order directly from the index instead of using a filesort.
mysql-test/mysql-test-run.sh:
[ -n $SKIP_TEST ] --> [ -n "$SKIP_TEST" ]; portability fix
mysql-test/r/order_by.result:
Added test for ORDER BY DESC optimization
mysql-test/t/order_by.test:
Added test for ORDER BY DESC optimization
sql/opt_range.cc:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/opt_range.h:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
sql/sql_select.cc:
Added QUICK_SELECT_DESC class which implements ORDER BY DESC optimization.
BitKeeper/etc/ignore:
Added .gdbinit .vimrc to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
updated rotate event to set new position along with the new log
mysql-test/mysql-test-run.sh:
added --do-test
mysql-test/r/rpl_log.result:
update for new rotate event format
sql/log_event.cc:
rotate event now supports forcing a new position, not just the log
sql/log_event.h:
clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
accept position setting from rotate event
sql/sql_repl.cc:
updates to fake_rotate_event() for the new format
Changed mysql-test to use --language
Cleaned up parameters to filesort()
configure.in:
Fixed typo
mysql-test/install_test_db.sh:
Changed test case to use --language
mysql-test/mysql-test-run.sh:
Changed test case to use --language
Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
Fixed test case to make it repeatable
mysql-test/t/insert.test:
Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
Cleaned up test
mysql-test/t/select_found.test:
Fixed test case to make it repeatable
sql/filesort.cc:
Fixed bug when sorting big files (introduced with multi-table-delete)
cleaned up parameters.
sql/mysql_priv.h:
Cleaned up parameters to filesort()
sql/mysqld.cc:
Fixed typo on enum
sql/sql_delete.cc:
Cleanup
sql/sql_select.cc:
Cleanup
sql/sql_table.cc:
Cleanup
sql/sql_test.cc:
Cleanup
sql/sql_update.cc:
Cleanup
client/mysqltest.c:
Added --big-test argument
libmysqld/lib_sql.cc:
Reset error messages before new query.
libmysqld/lib_vio.c:
Fixed reading of results.
mysql-test/mysql-test-run.sh:
Added option --big
mysql-test/r/multi_update.result:
More multi-delete tests
mysql-test/t/bdb-crash.test:
Added missing test if BDB is supported
mysql-test/t/multi_update.test:
More multi-delete tests
mark a master-forced rotate with a special flag
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
updated result
mysql-test/t/rpl000017-slave.sh:
fix for change in master.info format
mysql-test/t/rpl_log.test:
test for correct last_log_seq in show slave status
sql/log.cc:
mark a master-forced rotate with a special flag
sql/log_event.cc:
show master forced rotate info in SHOW BINLOG EVENTS
sql/log_event.h:
master forced rotation flag
sql/slave.cc:
keep trace of last log sequences in MASTER_INFO
do not rotate on slave, if the rotation on master was forced by its master
sql/slave.h:
keep track of last log sequence number in MASTER_INFO
fixed bugs in log seq - now starting to look good
fixes for SHOW BINLOG EVENTS
will push this one
include/mysqld_error.h:
merged errors from 3.23
mysql-test/mysql-test-run.sh:
wrong quotes in --skip-test
mysql-test/r/drop.result:
updated test
mysql-test/r/rpl_log.result:
updated test
mysql-test/t/drop.test:
updated test
mysql-test/t/rpl_log.test:
fixed bugs in test case
sql/item_sum.h:
remove compiler warning about re-ordered initialization
sql/log.cc:
fixed a bunch of loq_seq bugs
sql/log_event.cc:
fixed log seq bugs, added info for Slave event in SHOW BINLOG EVENTS
sql/share/czech/errmsg.txt:
merged errors from 3.23
sql/share/danish/errmsg.txt:
merged errors from 3.23
sql/share/dutch/errmsg.txt:
merged errors from 3.23
sql/share/english/errmsg.txt:
merged errors from 3.23
sql/share/estonian/errmsg.txt:
merged errors from 3.23
sql/share/french/errmsg.txt:
merged errors from 3.23
sql/share/german/errmsg.txt:
merged errors from 3.23
sql/share/greek/errmsg.txt:
merged errors from 3.23
sql/share/hungarian/errmsg.txt:
merged errors from 3.23
sql/share/italian/errmsg.txt:
merged errors from 3.23
sql/share/japanese/errmsg.txt:
merged errors from 3.23
sql/share/korean/errmsg.txt:
merged errors from 3.23
sql/share/norwegian-ny/errmsg.txt:
merged errors from 3.23
sql/share/norwegian/errmsg.txt:
merged errors from 3.23
sql/share/polish/errmsg.txt:
merged errors from 3.23
sql/share/portuguese/errmsg.txt:
merged errors from 3.23
sql/share/romanian/errmsg.txt:
merged errors from 3.23
sql/share/russian/errmsg.txt:
merged errors from 3.23
sql/share/slovak/errmsg.txt:
merged errors from 3.23
sql/share/spanish/errmsg.txt:
merged errors from 3.23
sql/share/swedish/errmsg.txt:
merged errors from 3.23
sql/slave.cc:
fixed log_seq bugs
preserve originating server id in Intvar events to avoid inifinite loops
include/mysqld_error.h:
new error messages
mysql-test/r/drop.result:
updated result
mysql-test/r/flush.result:
updated result
mysql-test/t/drop.test:
test for proper handling of drop/create database when holding
global read lock
mysql-test/t/flush.test:
test to see if other thread would block on drop database if we
are holding global read lock
sql/log.cc:
preserve originating server id in Intvar log event
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/slave.cc:
fixed typo in comment
sql/sql_db.cc:
global read lock should block drop/create database
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup
will not push this changeset
include/mysqld_error.h:
new error
mysql-test/mysql-test-run.sh:
use quotes in expr
sql/lex.h:
SHOW BINLOG EVENTS
sql/log.cc:
fixed log sequence bugs
sql/log_event.cc:
SHOW BINLOG EVENTS
fixed bugs Slave event handling
sql/log_event.h:
SHOW BINLOG EVENTS
sql/share/english/errmsg.txt:
SHOW BINLOG EVENTS
sql/sql_lex.h:
SHOW BINLOG EVENTS
sql/sql_parse.cc:
SHOW BINLOG EVENTS
sql/sql_repl.cc:
SHOW BINLOG EVENTS
sql/sql_repl.h:
SHOW BINLOG EVENTS
sql/sql_yacc.yy:
SHOW BINLOG EVENTS
Docs/manual.texi:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
