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
Added prototype for my_thread_end
New error message for MATCH
Give error when using myisamchk --force --readonly
BitKeeper/deleted/.del-fulltext_join.test~e347c8f04405c916:
Delete: mysql-test/t/fulltext_join.test
Docs/manual.texi:
Added node to fulltext
configure.in:
Fix when using --without-server --with-thread-safe-client
include/mysql_com.h:
Added prototype for my_thread_end
include/mysqld_error.h:
New error message for MATCH
myisam/myisamchk.c:
Give error when using --force --readonly
mysql-test/t/fulltext.test:
Added test for error conditons with fulltext
sql/item_func.cc:
Fixed error messages when using MATCH ... AGAINST
sql/mysqld.cc:
Portability fix
sql/share/czech/errmsg.txt:
New error message when using MATCH
sql/share/danish/errmsg.txt:
New error message when using MATCH
sql/share/dutch/errmsg.txt:
New error message when using MATCH
sql/share/english/errmsg.txt:
New error message when using MATCH
sql/share/estonian/errmsg.txt:
New error message when using MATCH
sql/share/french/errmsg.txt:
New error message when using MATCH
sql/share/german/errmsg.txt:
New error message when using MATCH
sql/share/greek/errmsg.txt:
New error message when using MATCH
sql/share/hungarian/errmsg.txt:
New error message when using MATCH
sql/share/italian/errmsg.txt:
New error message when using MATCH
sql/share/japanese/errmsg.txt:
New error message when using MATCH
sql/share/korean/errmsg.txt:
New error message when using MATCH
sql/share/norwegian-ny/errmsg.txt:
New error message when using MATCH
sql/share/norwegian/errmsg.txt:
New error message when using MATCH
sql/share/polish/errmsg.txt:
New error message when using MATCH
sql/share/portuguese/errmsg.txt:
New error message when using MATCH
sql/share/romanian/errmsg.txt:
New error message when using MATCH
sql/share/russian/errmsg.txt:
New error message when using MATCH
sql/share/slovak/errmsg.txt:
New error message when using MATCH
sql/share/spanish/errmsg.txt:
New error message when using MATCH
sql/share/swedish/errmsg.OLD:
New error message when using MATCH
sql/share/swedish/errmsg.txt:
New error message when using MATCH
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.
mysql-test/t/rpl_magic.test:
Added missing drop table
mysql-test/t/rpl_mystery22.test:
Added missing drop table
mysql-test/t/rpl_sporadic_master.test:
Fixed bad merge
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
use truncate table
sql/slave.cc
fixed race condition on server shutdown
sql/sql_repl.cc
fixed uninitialized use of io_cache
mysql-test/t/rpl_sporadic_master.test:
use truncate table
sql/slave.cc:
fixed race condition on server shutdown
sql/sql_repl.cc:
fixed uninitialized use of io_cache
fixed test case to produce same results on txn-enabled binary.
temporary fix - permanent fix is it make mysqld behave the same with
MyISAM on auto_increment insert after delete from tbl_name regardless
of how the binary was compiled
sql/slave.cc
fixed concurrency bug with log_seq
sql/slave.h
last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc
cleared up comment and fixed concurrency bug
mysql-test/t/rpl_sporadic_master.test:
fixed test case to produce same results on txn-enabled binary.
temporary fix - permanent fix is it make mysqld behave the same with
MyISAM on auto_increment insert after delete from tbl_name regardless
of how the binary was compiled
sql/slave.cc:
fixed concurrency bug with log_seq
sql/slave.h:
last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc:
cleared up comment and fixed concurrency bug
Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened
Docs/manual.texi:
Redefinition of myisam_bulk_insert_tree_size
client/insert_test.c:
Changed to use mysql_real_connect()
include/mysql.h:
Moved things in mysql_options to optimize these for 64 bit processors
include/mysqld_error.h:
Removed new error message
myisam/mi_write.c:
Use myisam_bulk_insert_tree_size per table instead of per index
mysql-test/t/varbinary.test:
Fixed test case for varbinary
mysys/tree.c:
Fixed missing if
sql/filesort.cc:
Threads are again killable in "merge_buffers"
sql/log_event.h:
cleanup
sql/share/czech/errmsg.txt:
Removed new error message
sql/share/danish/errmsg.txt:
Removed new error message
sql/share/dutch/errmsg.txt:
Removed new error message
sql/share/english/errmsg.txt:
Removed new error message
sql/share/estonian/errmsg.txt:
Removed new error message
sql/share/french/errmsg.txt:
Removed new error message
sql/share/german/errmsg.txt:
Removed new error message
sql/share/greek/errmsg.txt:
Removed new error message
sql/share/hungarian/errmsg.txt:
Removed new error message
sql/share/italian/errmsg.txt:
Removed new error message
sql/share/japanese/errmsg.txt:
Removed new error message
sql/share/korean/errmsg.txt:
Removed new error message
sql/share/norwegian-ny/errmsg.txt:
Removed new error message
sql/share/norwegian/errmsg.txt:
Removed new error message
sql/share/polish/errmsg.txt:
Removed new error message
sql/share/portuguese/errmsg.txt:
Removed new error message
sql/share/romanian/errmsg.txt:
Removed new error message
sql/share/russian/errmsg.txt:
Removed new error message
sql/share/slovak/errmsg.txt:
Removed new error message
sql/share/spanish/errmsg.txt:
Removed new error message
sql/share/swedish/errmsg.txt:
Removed new error message
sql/sql_class.h:
Cleanup
sql/sql_delete.cc:
Cleanup
sql/sql_repl.cc:
Cleanup
sql/sql_show.cc:
SHOW OPEN TABLES now works when no tables are opened
sql/sql_sort.h:
Threads are again killable in "merge_buffers"
sql/uniques.cc:
Threads are again killable in "merge_buffers"
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.
include/my_base.h:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysys/tree.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_table.cc:
Auto merged
bulk inserts optimization: caching keys in binary tree
include/my_base.h:
bulk inserts optimization: caching keys in binary tree
include/my_tree.h:
memory-limited tree
include/myisam.h:
bulk inserts optimization: caching keys in binary tree
isam/isamlog.c:
memory-limited tree
isam/pack_isam.c:
memory-limited tree
myisam/ft_boolean_search.c:
memory-limited tree
myisam/ft_nlq_search.c:
memory-limited tree
myisam/ft_parser.c:
memory-limited tree
myisam/ft_stopwords.c:
memory-limited tree
myisam/mi_extra.c:
bulk inserts optimization: caching keys in binary tree
myisam/mi_open.c:
bulk inserts optimization: caching keys in binary tree
myisam/mi_static.c:
bulk inserts optimization: caching keys in binary tree
myisam/mi_write.c:
bulk inserts optimization: caching keys in binary tree
myisam/myisamdef.h:
bulk inserts optimization: caching keys in binary tree
myisam/myisamlog.c:
memory-limited tree
myisam/myisampack.c:
memory-limited tree
mysql-test/mysql-test-run.sh:
memory-limited tree
mysql-test/t/alter_table.test:
make it faster
mysys/tree.c:
memory-limited tree
sql/ha_myisam.cc:
bulk inserts optimization: caching keys in binary tree
sql/item_sum.cc:
memory-limited tree
sql/mysqld.cc:
bulk inserts optimization: caching keys in binary tree
sql/sql_analyse.h:
memory-limited tree
sql/uniques.cc:
memory-limited tree
mysql-test/t/multi_update.test:
Making a test change the order of the tables, so that initalize_tables
would be tested properly
mysys/my_compress.c:
Just changed my e-mail address .... ;o)
sql/filesort.cc:
Making sure that merge_buffers can not be killed
sql/sql_class.h:
Added initialize_tables
sql/sql_delete.cc:
Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
same as above
BitKeeper/etc/ignore:
Added locked to the ignore list
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
