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
mysql-test/r/union.result:
small bug fixes in unions
BitKeeper/etc/ignore:
Added Docs/manual.texi.orig Docs/manual.texi.rej to the ignore list
mysql-test/t/union.test:
test for a bug fix in union's
sql/sql_union.cc:
bug fix for unions
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 for Solaris and gethostbyname_r
Docs/manual.texi:
Changelog
client/mysql.cc:
Cleanup
configure.in:
Fix for Solaris and gethostbyname_r
sql/log_event.h:
Fix for load data infile when no active database
sql/sql_load.cc:
Fix for load data infile when no active database
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
Change the default innodb_data_file_path to create a 16M file and define it as auto-extending
sql/ha_innodb.cc:
Change the default innodb_data_file_path to create a 16M file and define it as auto-extending
Add foreign key defs to SHOW CREATE TABLE
sql/handler.cc:
Add foreign key defs to SHOW CREATE TABLE
sql/handler.h:
Add foreign key defs to SHOW CREATE TABLE
sql/sql_show.cc:
Add foreign key defs to SHOW CREATE TABLE
Fixes in charset related C++ code
configure.in:
Make things to be easier managable
include/m_ctype.h:
Hide some functions under conditional compilation
libmysql/Makefile.shared:
Make things to be easier managable
sql/item_func.cc:
Fixed that private member is not available in this context
sql/item_strfunc.cc:
Fixed that private member is not available in this context
strings/Makefile.am:
Make charset things to be easier managable
Some fixes in charset C++ code
strings/ctype-big5.c:
Hide some functions under conditional compilation
strings/ctype-czech.c:
Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
Hide some functions under conditional compilation
strings/ctype-gb2312.c:
Hide some functions under conditional compilation
strings/ctype-gbk.c:
Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
Hide some functions under conditional compilation
strings/ctype-mb.c:
Hide some functions under conditional compilation
strings/ctype-sjis.c:
Hide some functions under conditional compilation
strings/ctype-tis620.c:
Hide some functions under conditional compilation
strings/ctype-ujis.c:
Hide some functions under conditional compilation
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=
