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
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
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
Added foreign key def syntax + note that the check is not deferred to trx commit
Docs/manual.texi:
Added foreign key def syntax + note that the check is not deferred to trx commit
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/myisam.test:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Docs/manual.texi:
SCCS merged
mysql-test/r/fulltext.result:
SCCS merged
sql/mysqld.cc:
SCCS merged
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