Docs/manual.texi:
Auto merged
sql/mysqld.cc:
Auto merged
sql/records.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
sql/sql_repl.cc:
use local file
Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.
Docs/manual.texi:
Cleanup
configure.in:
Version number change
mysql-test/t/backup.test:
drop used tables
mysql-test/t/bdb-crash.test:
cleanup
mysys/thr_lock.c:
cleanup
sql/mysqld.cc:
safety fix
sql/records.cc:
Fixed bug where one got an empty set instead of a DEADLOCK error when using
BDB tables.
sql/sql_table.cc:
Fix race condition in ANALYZE TABLE.
BitKeeper/deleted/.del-WHITEPAPER~da1226799debcf3f:
Delete: libmysqld/WHITEPAPER
Docs/manual.texi:
Changelog
client/mysqltest.c:
Fix things that crashed embedded MySQL
libmysqld/examples/test-run:
Cleanup of old BDB files.
mysql-test/r/innodb.result:
Fix for embedded library
mysql-test/t/innodb.test:
Fix for embedded library
mysys/mf_keycache.c:
Safety
sql/ha_berkeley.cc:
Added DBUG statements
sql/ha_innobase.cc:
Fixed bug for embedded version
sql/ha_innobase.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/handler.h:
Fix to use index when doing an ORDER BY on a whole InnoDB table
sql/mysqld.cc:
Safety fix
sql/sql_base.cc:
cleanup
sql/sql_select.cc:
Fix to use index when doing an ORDER BY on a whole InnoDB table
fixed typo on sql_repl.cc
added build-tags script for the benefit of the poor, sick, and afflicted,
as Matt likes to say :-)
Docs/manual.texi:
replication updates
sql/sql_repl.cc:
fixed typo in comment
First (incomplete) version of transaction and as3ap tests.
BitKeeper/etc/ignore:
Added sql-bench/test-transactions to the ignore list
mysql-test/r/fulltext.result:
Update fulltext results after merge
sql-bench/Makefile.am:
Added transaction test
sql-bench/run-all-tests.sh:
Added transaction test
sql-bench/server-cfg.sh:
Added transaction test
sql-bench/test-ATIS.sh:
Cleanup
sql/item_func.cc:
Fix bad merge
sql/mysqld.cc:
Cleanup
sql/sql_base.cc:
Fix bad merge
sql/sql_delete.cc:
Cleanup
sql/sql_parse.cc:
Fix bad merge
sql/sql_select.cc:
Fix bad merge
sql/sql_union.cc:
Fix bad merge
tools/mysqlmanager.c:
C
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
sql/stacktrace.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_update.cc:
Auto merged
LOCATE() is now case sensitive
BUILD/compile-alpha-cxx:
Don't build manager because it fails with linker error on Linux Alpha
Docs/manual.texi:
Changelog
myisam/mi_check.c:
Fix bug when repairing compressed MyISAM files
myisam/mi_open.c:
Fix bug when repairing compressed MyISAM files
myisam/mi_packrec.c:
Fix bug when repairing compressed MyISAM files
myisam/myisamchk.c:
Fix bug when repairing compressed MyISAM files
myisam/myisamdef.h:
Fix bug when repairing compressed MyISAM files
mysql-test/r/func_group.result:
Fix result for new RND function
mysql-test/r/func_math.result:
Fix result for new RND function
mysql-test/r/func_str.result:
test of new locate()
mysql-test/t/func_str.test:
test of new locate()
sql/item_func.cc:
LOCATE() is now case sensitive
sql/sql_string.cc:
LOCATE() is now case sensitive
sql/sql_string.h:
LOCATE() is now case sensitive
signal. Tested to the extent that it does not break Linux. Could not test on
Darwin because the machine was not reachable. Will push anyway - at least it
does not make things worse. Testing on Darwin is needed, however.
sql/mysqld.cc:
backport of shutdown fix for platforms that cannot break a syscall with a signal
Docs/manual.texi:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_update.cc:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
configure.in:
no merge - used local
mysql-test/r/fulltext.result:
no merge - used local
mysql-test/r/myisam.result:
no merge - used local
sql/item_func.cc:
no merge - used local
sql/sql_delete.cc:
no merge - used local
sql/sql_parse.cc:
no merge - used local
sql/sql_select.cc:
no merge - used local
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization
sql/item_func.cc:
re-disabled implicit initialization that was re-enabled (by me)
for reasons unknown (at least the code passed all the tests)
sql/mysql_priv.h:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_base.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_parse.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
sql/sql_select.cc:
removed ftfuncs argument for mysql_select
it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
Docs/manual.texi:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/t/myisam.test:
Auto merged
Docs/manual.texi:
Updated changelog.
Update info about MERGE tables.
Moved section 'Why so many open tables'
mysql-test/r/create.result:
Added test of types in CREATE
mysql-test/t/create.test:
Added test of types in CREATE
sql/item_func.cc:
More different values for RAND(nr) and RAND(nr+1)
was up to date.
Docs/manual.texi:
ChangeLog
configure.in:
Version number change
mysql-test/r/myisam.result:
Test of optimize table
mysql-test/t/myisam.test:
Test of optimize table
--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master
client/mysqltest.c:
fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
connect to port specified in environment
mysql-test/mysql-test-run.sh:
added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
fixes to slave off 3.23 master
sql/log_event.h:
fixes to slave off 3.23 master
sql/slave.cc:
do not log CREATE TABLE when doing table dump
moved fail-safe replication routines from sql_repl.cc to repl_failsafe.cc
write start event only in the first log
client/mysqlbinlog.cc:
work to enable reading 3.23 logs
libmysql/Makefile.shared:
added mf_iocache2 to libmysqlclient - needed for mysqlbinlog
mysql-test/mysql-test-run.sh:
added --start-and-exit
mysql-test/r/rpl000002.result:
result clean-up
mysql-test/r/rpl000016.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/t/rpl000016.test:
test cleanup
mysys/mf_iocache.c:
fixed new bug
sql/log.cc:
write start event only on server start or after reset master
sql/log_event.cc:
work to enable reading 3.23 log format
sql/log_event.h:
work to enable reading 3.23 format
sql/repl_failsafe.cc:
code restructuring
sql/repl_failsafe.h:
re-organized code
sql/slave.cc:
check master version
sql/slave.h:
old_format member
sql/sql_class.h:
allow user to specify io cache type
need_start_event member to allow writing start event only in the first log
sql/sql_parse.cc:
code re-organization
sql/sql_repl.cc:
code reorganization
sql/sql_repl.h:
reorganized code
fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run
include/my_sys.h:
fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
fixed missing \ bug
added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
fixed shutdown bug when singals DO break read introduced by the fix for
when they don't.
sql/repl_failsafe.cc:
fixed memory leak
Docs/manual.texi:
Changelog
mysql-test/r/update.result:
Test found bug in UPDATE .. ORDER BY
mysql-test/t/update.test:
Test found bug in UPDATE .. ORDER BY
